mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 11:40:31 -04:00
5817b9bf96
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@
48 lines
1.3 KiB
Text
48 lines
1.3 KiB
Text
$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
|
|
@@ -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
|
|
- OTHER_LDLIBS += -L/usr/local/lib -liconv
|
|
+ OTHER_INCLUDES += -I${LOCALBASE}/include
|
|
+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
|
|
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)
|