ports/java/jdk15/files/patch-j2se::zip::Makefile
Greg Lewis 5817b9bf96 . Link with the system libz instead of building the our own internal
copy.  This should have the following effects:

  . Fix problems experienced by programmes that dynamically create their
    own copy of the JVM and are linked against the system's zlib (e.g.,
    eclipse).
  . Reduce the potential for zlib based security problems affecting the
    JDK.

Submitted by:	mi@
2006-01-28 23:41:24 +00:00

19 lines
534 B
Text

--- ../../j2se/make/java/zip/Makefile Tue Oct 19 14:44:55 2004
+++ ../../j2se/make/java/zip/Makefile Sat Oct 15 14:02:40 2005
@@ -59,11 +59,4 @@
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
@@ -74,3 +67,3 @@
# Link to JVM library for JVM_Zip* functions
#
-OTHER_LDLIBS = $(JVMLIB)
+OTHER_LDLIBS = -lz