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/jdk15/files/patch-j2se::instrument::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@
Notes
Notes:
svn path=/head/; revision=154692
Diffstat (limited to 'java/jdk15/files/patch-j2se::instrument::Makefile')
| -rw-r--r-- | java/jdk15/files/patch-j2se::instrument::Makefile | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile index 8934bfc11fe3..2ce0f43ea3e3 100644 --- a/java/jdk15/files/patch-j2se::instrument::Makefile +++ b/java/jdk15/files/patch-j2se::instrument::Makefile @@ -2,8 +2,35 @@ $FreeBSD$ --- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005 +++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005 -@@ -72,8 +72,8 @@ +@@ -39,5 +39,4 @@ + # into the instrument library. + # +-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io + LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin +@@ -45,12 +44,4 @@ + + FILES_c += \ +- inflate.c \ +- infblock.c \ +- infcodes.c \ +- inffast.c \ +- inftrees.c \ +- zadler32.c \ +- infutil.c \ +- zutil.c \ + canonicalize_md.c \ + parse_manifest.c +@@ -61,5 +60,4 @@ + OTHER_INCLUDES = -I$(SHARE_SRC)/instrument + OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument +-OTHER_INCLUDES += -I$(ZIP_SRC) + OTHER_INCLUDES += -I$(IO_PLATFORM_SRC) + OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC) +@@ -71,9 +61,10 @@ + COMPILER_WARNING_LEVEL=0 else ++OTHER_LDLIBS += -lz ifeq ($(PLATFORM), bsd) ifneq ($(TRUE_PLATFORM), NetBSD) - OTHER_INCLUDES += -I/usr/local/include @@ -13,3 +40,9 @@ $FreeBSD$ endif else OTHER_LDLIBS = -lnsl -ldl +@@ -123,5 +121,4 @@ + # + vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument +-vpath %.c $(ZIP_SRC) + vpath %.c $(IO_PLATFORM_SRC) + vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) |