diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-01-28 23:41:24 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-01-28 23:41:24 +0000 |
| commit | 5817b9bf96b898283cc29f0834ef0712ad49c073 (patch) | |
| tree | 98b2d9120142d5cc95e98d013aca28e6918d128f /java/jdk16/files/patch-j2se::zip::Makefile | |
| parent | Add zlib to plist if FreeBSD < 5.0 (diff) | |
. 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@
Diffstat (limited to 'java/jdk16/files/patch-j2se::zip::Makefile')
| -rw-r--r-- | java/jdk16/files/patch-j2se::zip::Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-j2se::zip::Makefile b/java/jdk16/files/patch-j2se::zip::Makefile new file mode 100644 index 000000000000..d6638e36a07d --- /dev/null +++ b/java/jdk16/files/patch-j2se::zip::Makefile @@ -0,0 +1,19 @@ +--- ../../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 |