mirror of
https://git.freebsd.org/ports.git
synced 2025-06-11 15:50:33 -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@
29 lines
979 B
Text
29 lines
979 B
Text
--- ../../j2se/make/com/sun/java/pack/Makefile Tue Oct 19 14:44:46 2004
|
|
+++ ../../j2se/make/com/sun/java/pack/Makefile Sun Oct 16 09:07:12 2005
|
|
@@ -36,24 +36,6 @@
|
|
|
|
|
|
-
|
|
-
|
|
ifeq ($(STANDALONE),true)
|
|
- ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
|
|
-
|
|
- ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
|
|
- $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
|
|
-
|
|
- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
|
- OTHER_CXXFLAGS += $(ZINCLUDE)
|
|
- LDDFLAGS += $(ZIPOBJS)
|
|
+ LDDFLAGS += -lz
|
|
else
|
|
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
|
|
|