cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use system libz instead of internal libz

Browse Source
This commit is contained in:
kurt 2006-11-15 17:27:40 +00:00
parent cb60ca19b2
commit 7a8823ecec
4 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/jdk/1.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2006/11/11 21:04:27 steven Exp $
# $OpenBSD: Makefile,v 1.21 2006/11/15 17:27:40 kurt Exp $
# $FreeBSD: ports/java/jdk12/Makefile,v 1.11 2002/08/19 20:47:04 glewis Exp $
ONLY_FOR_ARCHS= arm i386 powerpc sparc
@ -7,8 +7,8 @@ COMMENT= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.3.1
DISTNAME= j2sdk-1_3_1-src
PKGNAME= jdk-${V}p7
PKGNAME-jre= jre-${V}p7
PKGNAME= jdk-${V}p8
PKGNAME-jre= jre-${V}p8
CATEGORIES= devel/jdk java
@ -89,7 +89,7 @@ PATCH_LIST= patch-* sparc-patch-*
. endif
.endif
WANTLIB= ICE SM X11 Xext Xp Xt Xtst c m ossaudio
WANTLIB= ICE SM X11 Xext Xp Xt Xtst c m ossaudio z
ALL_TARGET= all images

10
devel/jdk/1.3/patches/patch-j2sdk1_3_1_make_common_Defs-bsd_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.3 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/make/common/Defs-bsd.gmk.orig Fri Mar 17 13:49:44 2006
+++ j2sdk1.3.1/make/common/Defs-bsd.gmk Sat Mar 18 00:14:03 2006
$OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.4 2006/11/15 17:27:40 kurt Exp $
--- j2sdk1.3.1/make/common/Defs-bsd.gmk.orig Mon Nov 6 20:23:31 2006
+++ j2sdk1.3.1/make/common/Defs-bsd.gmk Mon Nov 6 21:25:00 2006
@@ -32,9 +32,9 @@
AR = $(USRBIN_PATH)ar
AS = $(USRBIN_PATH)as
@ -32,11 +32,13 @@ $OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.3 2006/03/20 14:40:25 ku
#
# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
@@ -413,7 +413,6 @@ ifeq ($(TRUE_PLATFORM), NetBSD)
@@ -413,8 +413,8 @@ ifeq ($(TRUE_PLATFORM), NetBSD)
else
ifeq ($(TRUE_PLATFORM), OpenBSD)
MOTIF_DIR=/usr/local
- CPPFLAGS_COMMON += -I$(MOTIF_DIR)/include
LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
+ SYSTEM_ZLIB = true
else
MOTIF_DIR=/usr/X11R6
endif

28
devel/jdk/1.3/patches/patch-j2sdk1_3_1_make_java_zip_Makefile Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-j2sdk1_3_1_make_java_zip_Makefile,v 1.1 2006/11/15 17:27:40 kurt Exp $
--- j2sdk1.3.1/make/java/zip/Makefile.orig Tue Nov 7 13:03:48 2006
+++ j2sdk1.3.1/make/java/zip/Makefile Tue Nov 7 13:09:20 2006
@@ -50,12 +50,14 @@ else
CPPFLAGS += -UDEBUG
endif
+ifneq ($(SYSTEM_ZLIB),true)
CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
#
# Add to ambient vpath so we pick up the library files
#
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+endif
include $(BUILDDIR)/Platform.gmk
#
@@ -68,6 +70,9 @@ JAVAHFLAGS += -jni
#
ifeq ($(PLATFORM),bsd)
JVMLIB =
+ifeq ($(SYSTEM_ZLIB),true)
+OTHER_LDLIBS = -lz
+endif
else
OTHER_LDLIBS = $(JVMLIB)
endif

22
devel/jdk/1.3/patches/patch-j2sdk1_3_1_make_minclude_java_zip_cmk Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-j2sdk1_3_1_make_minclude_java_zip_cmk,v 1.1 2006/11/15 17:27:40 kurt Exp $
--- j2sdk1.3.1/make/minclude/java_zip.cmk.orig Tue Nov 7 12:58:46 2006
+++ j2sdk1.3.1/make/minclude/java_zip.cmk Tue Nov 7 12:58:21 2006
@@ -8,6 +8,10 @@ FILES_c = \
$(CTARGDIR)Inflater.c \
$(CTARGDIR)ZipFile.c \
$(CTARGDIR)ZipEntry.c \
+ $(CTARGDIR)zip_util.c
+
+ifneq ($(SYSTEM_ZLIB),true)
+FILES_c += \
$(CTARGDIR)zadler32.c \
$(CTARGDIR)zcrc32.c \
$(CTARGDIR)deflate.c \
@@ -18,5 +22,5 @@ FILES_c = \
$(CTARGDIR)inftrees.c \
$(CTARGDIR)infcodes.c \
$(CTARGDIR)infutil.c \
- $(CTARGDIR)inffast.c \
- $(CTARGDIR)zip_util.c
+ $(CTARGDIR)inffast.c
+endif