diff options
Diffstat (limited to 'java/jdk14/files')
| -rw-r--r-- | java/jdk14/files/patch-j2se::zip::FILES_c.gmk | 18 | ||||
| -rw-r--r-- | java/jdk14/files/patch-j2se::zip::Makefile | 31 |
2 files changed, 49 insertions, 0 deletions
diff --git a/java/jdk14/files/patch-j2se::zip::FILES_c.gmk b/java/jdk14/files/patch-j2se::zip::FILES_c.gmk new file mode 100644 index 000000000000..dfe676c5b80a --- /dev/null +++ b/java/jdk14/files/patch-j2se::zip::FILES_c.gmk @@ -0,0 +1,18 @@ +--- ../../j2se/make/java/zip/FILES_c.gmk.orig Wed Sep 10 19:43:01 2003 ++++ ../../j2se/make/java/zip/FILES_c.gmk Sat Feb 11 00:55:54 2006 +@@ -8,15 +8,4 @@ + $(CTARGDIR)Inflater.c \ + $(CTARGDIR)ZipFile.c \ + $(CTARGDIR)ZipEntry.c \ +- $(CTARGDIR)zadler32.c \ +- $(CTARGDIR)zcrc32.c \ +- $(CTARGDIR)deflate.c \ +- $(CTARGDIR)trees.c \ +- $(CTARGDIR)zutil.c \ +- $(CTARGDIR)inflate.c \ +- $(CTARGDIR)infblock.c \ +- $(CTARGDIR)inftrees.c \ +- $(CTARGDIR)infcodes.c \ +- $(CTARGDIR)infutil.c \ +- $(CTARGDIR)inffast.c \ + $(CTARGDIR)zip_util.c diff --git a/java/jdk14/files/patch-j2se::zip::Makefile b/java/jdk14/files/patch-j2se::zip::Makefile new file mode 100644 index 000000000000..ed15182c29cc --- /dev/null +++ b/java/jdk14/files/patch-j2se::zip::Makefile @@ -0,0 +1,31 @@ +--- ../../j2se/make/java/zip/Makefile.orig Wed Sep 10 19:43:01 2003 ++++ ../../j2se/make/java/zip/Makefile Sat Feb 11 00:55:54 2006 +@@ -12,8 +12,6 @@ + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk + +-ZLIB_VERSION = 1.1.3 +- + # + # Files to compile. + # +@@ -58,13 +56,6 @@ + CPPFLAGS += -UDEBUG + endif + +-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) +- +-# +-# Add to ambient vpath so we pick up the library files +-# +-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) +- + # + # Has been converted to the JNI: generate JNI-style header files + # +@@ -73,4 +64,4 @@ + # + # Link to JVM library for JVM_Zip* functions + # +-OTHER_LDLIBS = $(JVMLIB) ++OTHER_LDLIBS = -lz |