diff options
| author | glewis <glewis@FreeBSD.org> | 2006-02-13 04:45:18 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2006-02-13 04:45:18 +0800 |
| commit | 1af5a66dccc69c956278ddd7e3f242a54dfa4212 (patch) | |
| tree | aff536fcbbfe2f5047eee0fc259c13121892bcc4 /java/jdk15 | |
| parent | 567942118bc336481ae0e8dbd99086ff48dea3ea (diff) | |
| download | freebsd-ports-graphics-1af5a66dccc69c956278ddd7e3f242a54dfa4212.tar.gz freebsd-ports-graphics-1af5a66dccc69c956278ddd7e3f242a54dfa4212.tar.zst freebsd-ports-graphics-1af5a66dccc69c956278ddd7e3f242a54dfa4212.zip | |
. Tweak the fix for linking with the system's version of zlib to just
ignore the internal zlib source files rather than having to rm them.
Submitted by: Kurt Miller <kurt@intricatesoftware.com>
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk15/files/patch-j2se::common::Program.gmk | 65 |
2 files changed, 60 insertions, 7 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 90f641b1b34..9c415e21df7 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -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-*/*' diff --git a/java/jdk15/files/patch-j2se::common::Program.gmk b/java/jdk15/files/patch-j2se::common::Program.gmk index 06918312c6f..86d7e87e7a6 100644 --- a/java/jdk15/files/patch-j2se::common::Program.gmk +++ b/java/jdk15/files/patch-j2se::common::Program.gmk @@ -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. + # |