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::common::Program.gmk | |
| 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::common::Program.gmk')
| -rw-r--r-- | java/jdk16/files/patch-j2se::common::Program.gmk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-j2se::common::Program.gmk b/java/jdk16/files/patch-j2se::common::Program.gmk new file mode 100644 index 000000000000..06918312c6f5 --- /dev/null +++ b/java/jdk16/files/patch-j2se::common::Program.gmk @@ -0,0 +1,16 @@ +--- ../../j2se/make/common/Program.gmk Tue Oct 19 14:44:50 2004 ++++ ../../j2se/make/common/Program.gmk Sat Oct 15 12:37:38 2005 +@@ -17,5 +17,4 @@ + LAUNCHER_SHARE_SRC = $(SHARE_SRC) + endif +-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + + .PHONY: all optimized debug classes clean clobber +@@ -47,5 +46,6 @@ + $(OBJDIR)/zutil.$(OBJECT_SUFFIX) + +-FILES_o = $(LAUNCHER_o) $(ZLIB_o) ++FILES_o = $(LAUNCHER_o) ++LDFLAGS += -lz + + ifeq ($(PLATFORM), windows) |