freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

. Tweak the fix for linking with the system's version of zlib to just

Browse Source 
ignore the internal zlib source files rather than having to rm them.

Submitted by:	Kurt Miller <kurt@intricatesoftware.com>
This commit is contained in:
Greg Lewis
2006-02-12 20:45:18 +00:00
parent 6e47d185ff
commit 1fd0bf2541
4 changed files with 120 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/jdk15/Makefile
View File

@@ -332,5 +332,3 @@ post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
EXTRACT_AFTER_ARGS+= -x '*/zlib-*/*'

65
java/jdk15/files/patch-j2se::common::Program.gmk
View File

@@ -1,16 +1,71 @@
--- ../../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 @@
--- ../../j2se/make/common/Program.gmk 28 Jan 2006 15:48:04 -0000 1.2
+++ ../../j2se/make/common/Program.gmk 3 Feb 2006 15:58:58 -0000 1.3
@@ -16,7 +16,6 @@
ifndef LAUNCHER_SHARE_SRC
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)
@@ -34,19 +33,8 @@
$(OBJDIR)/parse_manifest.$(OBJECT_SUFFIX) \
$(OBJDIR)/version_comp.$(OBJECT_SUFFIX)
-#
-# zlib files statically imported
-#
-ZLIB_o = $(OBJDIR)/inflate.$(OBJECT_SUFFIX) \
- $(OBJDIR)/inftrees.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infblock.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infcodes.$(OBJECT_SUFFIX) \
- $(OBJDIR)/inffast.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infutil.$(OBJECT_SUFFIX) \
- $(OBJDIR)/zadler32.$(OBJECT_SUFFIX) \
- $(OBJDIR)/zutil.$(OBJECT_SUFFIX)
-
-FILES_o = $(LAUNCHER_o) $(ZLIB_o)
+FILES_o = $(LAUNCHER_o)
+LDFLAGS += -lz
ifeq ($(PLATFORM), windows)
@@ -189,7 +177,6 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
# this may not be necessrary...
ifeq ($(PLATFORM), windows)
@@ -218,30 +205,6 @@
$(OBJDIR)/version_comp.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/version_comp.c
$(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-$(OBJDIR)/inflate.$(OBJECT_SUFFIX): $(ZIP_SRC)/inflate.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infblock.$(OBJECT_SUFFIX): $(ZIP_SRC)/infblock.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infcodes.$(OBJECT_SUFFIX): $(ZIP_SRC)/infcodes.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/inffast.$(OBJECT_SUFFIX): $(ZIP_SRC)/inffast.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/inftrees.$(OBJECT_SUFFIX): $(ZIP_SRC)/inftrees.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/zadler32.$(OBJECT_SUFFIX): $(ZIP_SRC)/zadler32.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infutil.$(OBJECT_SUFFIX): $(ZIP_SRC)/infutil.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/zutil.$(OBJECT_SUFFIX): $(ZIP_SRC)/zutil.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
#
# How to install jvm.cfg.
#

2
java/jdk16/Makefile
View File

@@ -332,5 +332,3 @@ post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
EXTRACT_AFTER_ARGS+= -x '*/zlib-*/*'

65
java/jdk16/files/patch-j2se::common::Program.gmk
View File

@@ -1,16 +1,71 @@
--- ../../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 @@
--- ../../j2se/make/common/Program.gmk 28 Jan 2006 15:48:04 -0000 1.2
+++ ../../j2se/make/common/Program.gmk 3 Feb 2006 15:58:58 -0000 1.3
@@ -16,7 +16,6 @@
ifndef LAUNCHER_SHARE_SRC
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)
@@ -34,19 +33,8 @@
$(OBJDIR)/parse_manifest.$(OBJECT_SUFFIX) \
$(OBJDIR)/version_comp.$(OBJECT_SUFFIX)
-#
-# zlib files statically imported
-#
-ZLIB_o = $(OBJDIR)/inflate.$(OBJECT_SUFFIX) \
- $(OBJDIR)/inftrees.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infblock.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infcodes.$(OBJECT_SUFFIX) \
- $(OBJDIR)/inffast.$(OBJECT_SUFFIX) \
- $(OBJDIR)/infutil.$(OBJECT_SUFFIX) \
- $(OBJDIR)/zadler32.$(OBJECT_SUFFIX) \
- $(OBJDIR)/zutil.$(OBJECT_SUFFIX)
-
-FILES_o = $(LAUNCHER_o) $(ZLIB_o)
+FILES_o = $(LAUNCHER_o)
+LDFLAGS += -lz
ifeq ($(PLATFORM), windows)
@@ -189,7 +177,6 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
# this may not be necessrary...
ifeq ($(PLATFORM), windows)
@@ -218,30 +205,6 @@
$(OBJDIR)/version_comp.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/version_comp.c
$(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-$(OBJDIR)/inflate.$(OBJECT_SUFFIX): $(ZIP_SRC)/inflate.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infblock.$(OBJECT_SUFFIX): $(ZIP_SRC)/infblock.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infcodes.$(OBJECT_SUFFIX): $(ZIP_SRC)/infcodes.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/inffast.$(OBJECT_SUFFIX): $(ZIP_SRC)/inffast.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/inftrees.$(OBJECT_SUFFIX): $(ZIP_SRC)/inftrees.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/zadler32.$(OBJECT_SUFFIX): $(ZIP_SRC)/zadler32.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/infutil.$(OBJECT_SUFFIX): $(ZIP_SRC)/infutil.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
-$(OBJDIR)/zutil.$(OBJECT_SUFFIX): $(ZIP_SRC)/zutil.c
- $(CC) -c $(CC_OBJECT_OUTPUT_FLAG)$@ $(CPPFLAGS) $(CFLAGS) $(VERSION_DEFINES) $<
-
#
# How to install jvm.cfg.
#