summaryrefslogtreecommitdiff
path: root/java/jdk14/files/patch-j2se::zip::Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk14/files/patch-j2se::zip::Makefile')
-rw-r--r--java/jdk14/files/patch-j2se::zip::Makefile31
1 files changed, 31 insertions, 0 deletions
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