mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-04 06:15:24 +00:00
. Update to 1.5.0 patchset 3.
This commit is contained in:
parent
23809273e6
commit
e81e856fc6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=158993
java
jdk15
Makefiledistinfo
files
patch-deploy::common::Defs-bsd.gmkpatch-deploy::common::DeployRules-solaris.gmkpatch-deploy::native::msgString.cpatch-deploy::native::system_md.cpatch-deploy::native::system_md.hpatch-deploy::ns7-adapter::Makefilepatch-hotspot::vm::amd64.adpatch-install::common::Pack.gmkpatch-j2se::awt::Toolkit.javapatch-j2se::awt::awt_LoadLibrary.cpatch-j2se::common::Program.gmkpatch-j2se::instrument::Makefilepatch-j2se::net::Inet4AddressImpl.cpatch-j2se::pack::Makefilepatch-j2se::pack::defines.hpatch-j2se::zip::FILES_c.gmkpatch-j2se::zip::Makefile
jdk16
Makefiledistinfo
files
patch-deploy::common::Defs-bsd.gmkpatch-deploy::common::DeployRules-solaris.gmkpatch-deploy::native::msgString.cpatch-deploy::native::system_md.cpatch-deploy::native::system_md.hpatch-deploy::ns7-adapter::Makefilepatch-hotspot::vm::amd64.adpatch-install::common::Pack.gmkpatch-j2se::awt::Toolkit.javapatch-j2se::awt::awt_LoadLibrary.cpatch-j2se::common::Program.gmkpatch-j2se::instrument::Makefilepatch-j2se::net::Inet4AddressImpl.cpatch-j2se::pack::Makefilepatch-j2se::pack::defines.hpatch-j2se::zip::FILES_c.gmkpatch-j2se::zip::Makefile
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= jdk
|
||||
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
|
||||
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
|
||||
@ -57,7 +56,7 @@ SUB_LIST+= JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \
|
||||
WRKSRC= ${WRKDIR}/control/make
|
||||
|
||||
JDK_VERSION= 1.5.0
|
||||
JDK_PATCHSET_VERSION= 2
|
||||
JDK_PATCHSET_VERSION= 3
|
||||
LATEST_LINK= jdk15
|
||||
|
||||
SUN_LINUX_JDK_VERSION= 1.4.2
|
||||
|
@ -4,6 +4,6 @@ SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
|
||||
MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
|
||||
SHA256 (jdk-1_5_0-bin-scsl.zip) = f7be15e4478165c361d011f39c02fea558dba442aeb3556357f4c7771db763f1
|
||||
SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
|
||||
MD5 (bsd-jdk15-patches-2.tar.bz2) = fb002d290db6fababba3e81e121d8dbd
|
||||
SHA256 (bsd-jdk15-patches-2.tar.bz2) = 1c84963745743678c2952744f8d34a4e2aa054280720446b904e8ddec55f0d98
|
||||
SIZE (bsd-jdk15-patches-2.tar.bz2) = 639356
|
||||
MD5 (bsd-jdk15-patches-3.tar.bz2) = 66e19561ca6d0e775dcd590fd97a6921
|
||||
SHA256 (bsd-jdk15-patches-3.tar.bz2) = 84bff46fb1f091fb8a508287cadd740cdc07691c616a72a9d84d3ee53b8cab6c
|
||||
SIZE (bsd-jdk15-patches-3.tar.bz2) = 650413
|
||||
|
@ -1,20 +1,13 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Aug 2005 01:06:25 -0000 1.5
|
||||
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Sep 2005 03:26:43 -0000
|
||||
@@ -27,3 +27,15 @@
|
||||
ifdef ALT_MOZILLA_HEADERS_PATH
|
||||
MOZILLA_HEADERS_PATH=$(ALT_MOZILLA_HEADERS_PATH)
|
||||
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006
|
||||
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006
|
||||
@@ -29,7 +29,7 @@
|
||||
endif
|
||||
+
|
||||
+# Default NSPR_PATH and allow override.
|
||||
|
||||
# Default NSPR_PATH and allow override.
|
||||
-NSPR_PATH = /usr/local
|
||||
+NSPR_PATH = ${LOCALBASE}
|
||||
+ifdef ALT_NSPR_PATH
|
||||
+ NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
|
||||
+endif
|
||||
+
|
||||
+# Default NSPR Headers directory
|
||||
+NSPR_HEADERS_PATH=$(NSPR_PATH)/include/nspr
|
||||
+ifdef ALT_NSPR_HEADERS_PATH
|
||||
+ NSPR_HEADERS_PATH=$(ALT_NSPR_HEADERS_PATH)
|
||||
+endif
|
||||
ifdef ALT_NSPR_PATH
|
||||
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
|
||||
endif
|
||||
|
@ -1,17 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/common/DeployRules-solaris.gmk.orig Mon Sep 26 17:20:33 2005
|
||||
+++ ../../deploy/make/common/DeployRules-solaris.gmk Mon Sep 26 17:25:34 2005
|
||||
@@ -43,10 +43,10 @@
|
||||
$(CP) $(DEPLOY_COMMON_SO_DBG) $(DEPLOY_OUTPUT_LIB_DBG)
|
||||
|
||||
$(DEPLOYOBJDIR)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c
|
||||
- $(CXX) -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
+ $(CXX) -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
|
||||
$(DEPLOYOBJDIR_DBG)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c
|
||||
- $(CXX) -g -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
+ $(CXX) -g -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
|
||||
deploy-so-mkdir:
|
||||
$(MKDIR) -p $(DEPLOYOBJDIR) $(DEPLOYOBJDIR_DBG) $(COMMON_LIB_DIR) $(COMMON_LIB_DIR_DBG)
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/share/native/msgString.c 19 May 2005 19:55:19 -0000 1.2
|
||||
+++ ../../deploy/src/javaws/share/native/msgString.c 5 Oct 2005 17:59:39 -0000
|
||||
@@ -146,7 +146,7 @@
|
||||
if (value == NULL) {
|
||||
value = defaultMessage;
|
||||
}
|
||||
-#ifdef __OpenBSD__ /* XXXBSD: DISABLE_LOCALE */
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__) /* XXXBSD: DISABLE_LOCALE */
|
||||
v2 = strdup(value);
|
||||
#else
|
||||
len2 = DecodeMessage(value, wArray);
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/solaris/native/system_md.c 19 May 2005 19:38:24 -0000 1.4
|
||||
+++ ../../deploy/src/javaws/solaris/native/system_md.c 5 Oct 2005 17:59:39 -0000
|
||||
@@ -10,7 +10,7 @@
|
||||
* unicode conversion for now at all. It means that japanese, korean,
|
||||
* chinese, etc locales are not available.
|
||||
*/
|
||||
-#if defined(__OpenBSD__)
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
|
||||
#define DISABLE_LOCALE 1
|
||||
#endif
|
||||
|
@ -1,28 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/solaris/native/system_md.h 8 Nov 2004 22:26:54 -0000 1.1.1.1
|
||||
+++ ../../deploy/src/javaws/solaris/native/system_md.h 5 Oct 2005 17:59:39 -0000
|
||||
@@ -35,6 +35,23 @@
|
||||
#ifdef LINUX
|
||||
#define PLATFORM "Linux"
|
||||
#define ARCH "i386"
|
||||
+#elif _ALLBSD_SOURCE /* LINUX */
|
||||
+#ifdef __FreeBSD__
|
||||
+#define PLATFORM "FreeBSD"
|
||||
+#elif __NetBSD__
|
||||
+#define PLATFORM "NetBSD"
|
||||
+#elif __OpenBSD__
|
||||
+#define PLATFORM "OpenBSD"
|
||||
+#elif __DragonFly__
|
||||
+#define PLATFORM "DragonFly"
|
||||
+#endif
|
||||
+#ifdef __amd64__
|
||||
+#define ARCH "amd64"
|
||||
+#elif __i386__
|
||||
+#define ARCH "i386"
|
||||
+#else
|
||||
+#error "Unsupported architecture"
|
||||
+#endif
|
||||
#else /* LINUX */
|
||||
#define PLATFORM "SunOS"
|
||||
#ifdef __i386
|
@ -1,20 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile 24 May 2005 18:04:09 -0000 1.4
|
||||
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile 12 Sep 2005 03:29:05 -0000
|
||||
@@ -86,6 +86,7 @@
|
||||
endif
|
||||
X11HDRDIR = /usr/X11R6/include
|
||||
ICONVHDRDIR = /usr/local/include
|
||||
+NSPRHDRDIR = $(NSPR_HEADERS_PATH)
|
||||
else
|
||||
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \
|
||||
$(subst \,/, $(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7/nspr)
|
||||
@@ -110,6 +111,7 @@
|
||||
$(COREDIR) \
|
||||
$(INTERFACESDIR) \
|
||||
$(MOZHDRDIR) \
|
||||
+ $(NSPRHDRDIR) \
|
||||
$(X11HDRDIR) \
|
||||
$(ICONVHDRDIR)
|
||||
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig Wed Feb 8 15:18:24 2006
|
||||
+++ ../../hotspot/src/cpu/amd64/vm/amd64.ad Wed Feb 8 15:17:35 2006
|
||||
@@ -7246,7 +7246,7 @@
|
||||
|
||||
format %{ "negl $dst\t# int" %}
|
||||
opcode(0xF7, 0x03); // Opcode F7 /3
|
||||
- ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
|
||||
+ ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
|
||||
ins_pipe(ialu_reg);
|
||||
%}
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- ../../install/make/common/Pack.gmk Mon Sep 12 19:32:15 2005
|
||||
+++ ../../install/make/common/Pack.gmk Mon Sep 12 19:33:53 2005
|
||||
@@ -37,7 +37,7 @@
|
||||
# JRE_PACKED_JARS are defined in each of the Platform variants
|
||||
|
||||
JRE_PACKED_JARS = lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar
|
||||
-ifeq ($(ARCH_DATA_MODEL),32)
|
||||
+ifndef DONT_BUILD_DEPLOY
|
||||
JRE_PACKED_JARS += lib/plugin.jar
|
||||
JRE_PACKED_JARS += lib/javaws.jar
|
||||
JRE_PACKED_JARS += lib/deploy.jar
|
@ -1,20 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/share/classes/java/awt/Toolkit.java 10 Jan 2005 07:40:41 -0000 1.2
|
||||
+++ ../../j2se/src/share/classes/java/awt/Toolkit.java 9 Oct 2005 04:11:13 -0000
|
||||
@@ -809,12 +809,11 @@
|
||||
try {
|
||||
String defaultToolkit;
|
||||
|
||||
- /* XXXBSD: analyze and choose better one */
|
||||
- if (System.getProperty("os.name").equals("Linux")) {
|
||||
- defaultToolkit = "sun.awt.X11.XToolkit";
|
||||
+ if (System.getProperty("os.name").equals("SunOS")) {
|
||||
+ defaultToolkit = "sun.awt.motif.MToolkit";
|
||||
}
|
||||
else {
|
||||
- defaultToolkit = "sun.awt.motif.MToolkit";
|
||||
+ defaultToolkit = "sun.awt.X11.XToolkit";
|
||||
}
|
||||
nm = System.getProperty("awt.toolkit",
|
||||
defaultToolkit);
|
@ -1,14 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 10 Jan 2005 15:09:40 -0000 1.2
|
||||
+++ ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 9 Oct 2005 05:34:52 -0000
|
||||
@@ -195,8 +195,7 @@
|
||||
}
|
||||
}
|
||||
else {
|
||||
-/* XXXBSD: decide which toolkit to use */
|
||||
-#if defined(__linux)
|
||||
+#if defined(__linux) || defined(_ALLBSD_SOURCE)
|
||||
/* Default AWT Toolkit on Linux is XAWT. */
|
||||
strcpy(p, "/xawt/libmawt");
|
||||
XAWT = 1;
|
@ -1,71 +0,0 @@
|
||||
--- ../../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
|
||||
|
||||
@@ -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,35 +2,8 @@ $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
|
||||
@@ -72,8 +72,8 @@
|
||||
else
|
||||
+OTHER_LDLIBS += -lz
|
||||
ifeq ($(PLATFORM), bsd)
|
||||
ifneq ($(TRUE_PLATFORM), NetBSD)
|
||||
- OTHER_INCLUDES += -I/usr/local/include
|
||||
@ -40,9 +13,3 @@ $FreeBSD$
|
||||
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)
|
||||
|
@ -1,27 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 10 Aug 2005 16:51:14 -0000 1.8
|
||||
+++ ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 21 Sep 2005 02:27:28 -0000 1.9
|
||||
@@ -608,6 +608,8 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#endif /* USE_GETADDRINFO */
|
||||
+
|
||||
#define SET_NONBLOCKING(fd) { \
|
||||
int flags = fcntl(fd, F_GETFL); \
|
||||
flags |= O_NONBLOCK; \
|
||||
@@ -860,6 +862,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef USE_GETADDRINFO
|
||||
#if defined(_ALLBSD_SOURCE)
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
@@ -1069,4 +1072,4 @@
|
||||
#endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */
|
||||
|
||||
#endif
|
||||
-#endif /* USE_GETADDRINFO */
|
||||
+#endif /* !USE_GETADDRINFO */
|
@ -1,29 +0,0 @@
|
||||
--- ../../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
|
||||
|
@ -1,24 +0,0 @@
|
||||
--- ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Tue Oct 19 14:59:48 2004
|
||||
+++ ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Sun Oct 16 09:06:04 2005
|
||||
@@ -15,4 +15,8 @@
|
||||
#endif
|
||||
|
||||
+#ifndef NO_ZLIB
|
||||
+# include <zconf.h>
|
||||
+#endif
|
||||
+
|
||||
#ifndef FULL
|
||||
#define FULL 1 /* Adds <500 bytes to the zipped final product. */
|
||||
@@ -70,4 +74,5 @@
|
||||
|
||||
typedef unsigned int uint;
|
||||
+#ifdef NO_ZLIB
|
||||
#ifdef _LP64
|
||||
typedef unsigned int uLong; // Historical zlib, should be 32-bit.
|
||||
@@ -75,4 +80,6 @@
|
||||
typedef unsigned long uLong;
|
||||
#endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef _MSC_VER
|
||||
typedef LONGLONG jlong;
|
@ -1,17 +0,0 @@
|
||||
--- ../../j2se/make/java/zip/FILES_c.gmk Tue Oct 19 14:44:55 2004
|
||||
+++ ../../j2se/make/java/zip/FILES_c.gmk Sat Oct 15 14:51:44 2005
|
||||
@@ -9,14 +9,3 @@
|
||||
$(CTARGDIR)ZipFile.c \
|
||||
$(CTARGDIR)ZipEntry.c \
|
||||
- $(CTARGDIR)zadler32.c \
|
||||
- $(CTARGDIR)zcrc32.c \
|
||||
- $(CTARGDIR)deflate.c \
|
||||
- $(CTARGDIR)trees.c \
|
||||
- $(CTARGDIR)zutil.c \
|
||||
- $(CTARGDIR)inflate.c \
|
||||
- $(CTARGDIR)infblock.c \
|
||||
- $(CTARGDIR)inftrees.c \
|
||||
- $(CTARGDIR)infcodes.c \
|
||||
- $(CTARGDIR)infutil.c \
|
||||
- $(CTARGDIR)inffast.c \
|
||||
$(CTARGDIR)zip_util.c
|
@ -1,19 +0,0 @@
|
||||
--- ../../j2se/make/java/zip/Makefile Tue Oct 19 14:44:55 2004
|
||||
+++ ../../j2se/make/java/zip/Makefile Sat Oct 15 14:02:40 2005
|
||||
@@ -59,11 +59,4 @@
|
||||
endif
|
||||
|
||||
-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)
|
||||
-
|
||||
#
|
||||
# Has been converted to the JNI: generate JNI-style header files
|
||||
@@ -74,3 +67,3 @@
|
||||
# Link to JVM library for JVM_Zip* functions
|
||||
#
|
||||
-OTHER_LDLIBS = $(JVMLIB)
|
||||
+OTHER_LDLIBS = -lz
|
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= jdk
|
||||
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
|
||||
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
|
||||
@ -57,7 +56,7 @@ SUB_LIST+= JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \
|
||||
WRKSRC= ${WRKDIR}/control/make
|
||||
|
||||
JDK_VERSION= 1.5.0
|
||||
JDK_PATCHSET_VERSION= 2
|
||||
JDK_PATCHSET_VERSION= 3
|
||||
LATEST_LINK= jdk15
|
||||
|
||||
SUN_LINUX_JDK_VERSION= 1.4.2
|
||||
|
@ -4,6 +4,6 @@ SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
|
||||
MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
|
||||
SHA256 (jdk-1_5_0-bin-scsl.zip) = f7be15e4478165c361d011f39c02fea558dba442aeb3556357f4c7771db763f1
|
||||
SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
|
||||
MD5 (bsd-jdk15-patches-2.tar.bz2) = fb002d290db6fababba3e81e121d8dbd
|
||||
SHA256 (bsd-jdk15-patches-2.tar.bz2) = 1c84963745743678c2952744f8d34a4e2aa054280720446b904e8ddec55f0d98
|
||||
SIZE (bsd-jdk15-patches-2.tar.bz2) = 639356
|
||||
MD5 (bsd-jdk15-patches-3.tar.bz2) = 66e19561ca6d0e775dcd590fd97a6921
|
||||
SHA256 (bsd-jdk15-patches-3.tar.bz2) = 84bff46fb1f091fb8a508287cadd740cdc07691c616a72a9d84d3ee53b8cab6c
|
||||
SIZE (bsd-jdk15-patches-3.tar.bz2) = 650413
|
||||
|
@ -1,20 +1,13 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Aug 2005 01:06:25 -0000 1.5
|
||||
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Sep 2005 03:26:43 -0000
|
||||
@@ -27,3 +27,15 @@
|
||||
ifdef ALT_MOZILLA_HEADERS_PATH
|
||||
MOZILLA_HEADERS_PATH=$(ALT_MOZILLA_HEADERS_PATH)
|
||||
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006
|
||||
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006
|
||||
@@ -29,7 +29,7 @@
|
||||
endif
|
||||
+
|
||||
+# Default NSPR_PATH and allow override.
|
||||
|
||||
# Default NSPR_PATH and allow override.
|
||||
-NSPR_PATH = /usr/local
|
||||
+NSPR_PATH = ${LOCALBASE}
|
||||
+ifdef ALT_NSPR_PATH
|
||||
+ NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
|
||||
+endif
|
||||
+
|
||||
+# Default NSPR Headers directory
|
||||
+NSPR_HEADERS_PATH=$(NSPR_PATH)/include/nspr
|
||||
+ifdef ALT_NSPR_HEADERS_PATH
|
||||
+ NSPR_HEADERS_PATH=$(ALT_NSPR_HEADERS_PATH)
|
||||
+endif
|
||||
ifdef ALT_NSPR_PATH
|
||||
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
|
||||
endif
|
||||
|
@ -1,17 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/common/DeployRules-solaris.gmk.orig Mon Sep 26 17:20:33 2005
|
||||
+++ ../../deploy/make/common/DeployRules-solaris.gmk Mon Sep 26 17:25:34 2005
|
||||
@@ -43,10 +43,10 @@
|
||||
$(CP) $(DEPLOY_COMMON_SO_DBG) $(DEPLOY_OUTPUT_LIB_DBG)
|
||||
|
||||
$(DEPLOYOBJDIR)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c
|
||||
- $(CXX) -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
+ $(CXX) -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
|
||||
$(DEPLOYOBJDIR_DBG)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c
|
||||
- $(CXX) -g -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
+ $(CXX) -g -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@
|
||||
|
||||
deploy-so-mkdir:
|
||||
$(MKDIR) -p $(DEPLOYOBJDIR) $(DEPLOYOBJDIR_DBG) $(COMMON_LIB_DIR) $(COMMON_LIB_DIR_DBG)
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/share/native/msgString.c 19 May 2005 19:55:19 -0000 1.2
|
||||
+++ ../../deploy/src/javaws/share/native/msgString.c 5 Oct 2005 17:59:39 -0000
|
||||
@@ -146,7 +146,7 @@
|
||||
if (value == NULL) {
|
||||
value = defaultMessage;
|
||||
}
|
||||
-#ifdef __OpenBSD__ /* XXXBSD: DISABLE_LOCALE */
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__) /* XXXBSD: DISABLE_LOCALE */
|
||||
v2 = strdup(value);
|
||||
#else
|
||||
len2 = DecodeMessage(value, wArray);
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/solaris/native/system_md.c 19 May 2005 19:38:24 -0000 1.4
|
||||
+++ ../../deploy/src/javaws/solaris/native/system_md.c 5 Oct 2005 17:59:39 -0000
|
||||
@@ -10,7 +10,7 @@
|
||||
* unicode conversion for now at all. It means that japanese, korean,
|
||||
* chinese, etc locales are not available.
|
||||
*/
|
||||
-#if defined(__OpenBSD__)
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
|
||||
#define DISABLE_LOCALE 1
|
||||
#endif
|
||||
|
@ -1,28 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/src/javaws/solaris/native/system_md.h 8 Nov 2004 22:26:54 -0000 1.1.1.1
|
||||
+++ ../../deploy/src/javaws/solaris/native/system_md.h 5 Oct 2005 17:59:39 -0000
|
||||
@@ -35,6 +35,23 @@
|
||||
#ifdef LINUX
|
||||
#define PLATFORM "Linux"
|
||||
#define ARCH "i386"
|
||||
+#elif _ALLBSD_SOURCE /* LINUX */
|
||||
+#ifdef __FreeBSD__
|
||||
+#define PLATFORM "FreeBSD"
|
||||
+#elif __NetBSD__
|
||||
+#define PLATFORM "NetBSD"
|
||||
+#elif __OpenBSD__
|
||||
+#define PLATFORM "OpenBSD"
|
||||
+#elif __DragonFly__
|
||||
+#define PLATFORM "DragonFly"
|
||||
+#endif
|
||||
+#ifdef __amd64__
|
||||
+#define ARCH "amd64"
|
||||
+#elif __i386__
|
||||
+#define ARCH "i386"
|
||||
+#else
|
||||
+#error "Unsupported architecture"
|
||||
+#endif
|
||||
#else /* LINUX */
|
||||
#define PLATFORM "SunOS"
|
||||
#ifdef __i386
|
@ -1,20 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile 24 May 2005 18:04:09 -0000 1.4
|
||||
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile 12 Sep 2005 03:29:05 -0000
|
||||
@@ -86,6 +86,7 @@
|
||||
endif
|
||||
X11HDRDIR = /usr/X11R6/include
|
||||
ICONVHDRDIR = /usr/local/include
|
||||
+NSPRHDRDIR = $(NSPR_HEADERS_PATH)
|
||||
else
|
||||
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \
|
||||
$(subst \,/, $(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7/nspr)
|
||||
@@ -110,6 +111,7 @@
|
||||
$(COREDIR) \
|
||||
$(INTERFACESDIR) \
|
||||
$(MOZHDRDIR) \
|
||||
+ $(NSPRHDRDIR) \
|
||||
$(X11HDRDIR) \
|
||||
$(ICONVHDRDIR)
|
||||
|
@ -1,13 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig Wed Feb 8 15:18:24 2006
|
||||
+++ ../../hotspot/src/cpu/amd64/vm/amd64.ad Wed Feb 8 15:17:35 2006
|
||||
@@ -7246,7 +7246,7 @@
|
||||
|
||||
format %{ "negl $dst\t# int" %}
|
||||
opcode(0xF7, 0x03); // Opcode F7 /3
|
||||
- ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
|
||||
+ ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
|
||||
ins_pipe(ialu_reg);
|
||||
%}
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- ../../install/make/common/Pack.gmk Mon Sep 12 19:32:15 2005
|
||||
+++ ../../install/make/common/Pack.gmk Mon Sep 12 19:33:53 2005
|
||||
@@ -37,7 +37,7 @@
|
||||
# JRE_PACKED_JARS are defined in each of the Platform variants
|
||||
|
||||
JRE_PACKED_JARS = lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar
|
||||
-ifeq ($(ARCH_DATA_MODEL),32)
|
||||
+ifndef DONT_BUILD_DEPLOY
|
||||
JRE_PACKED_JARS += lib/plugin.jar
|
||||
JRE_PACKED_JARS += lib/javaws.jar
|
||||
JRE_PACKED_JARS += lib/deploy.jar
|
@ -1,20 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/share/classes/java/awt/Toolkit.java 10 Jan 2005 07:40:41 -0000 1.2
|
||||
+++ ../../j2se/src/share/classes/java/awt/Toolkit.java 9 Oct 2005 04:11:13 -0000
|
||||
@@ -809,12 +809,11 @@
|
||||
try {
|
||||
String defaultToolkit;
|
||||
|
||||
- /* XXXBSD: analyze and choose better one */
|
||||
- if (System.getProperty("os.name").equals("Linux")) {
|
||||
- defaultToolkit = "sun.awt.X11.XToolkit";
|
||||
+ if (System.getProperty("os.name").equals("SunOS")) {
|
||||
+ defaultToolkit = "sun.awt.motif.MToolkit";
|
||||
}
|
||||
else {
|
||||
- defaultToolkit = "sun.awt.motif.MToolkit";
|
||||
+ defaultToolkit = "sun.awt.X11.XToolkit";
|
||||
}
|
||||
nm = System.getProperty("awt.toolkit",
|
||||
defaultToolkit);
|
@ -1,14 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 10 Jan 2005 15:09:40 -0000 1.2
|
||||
+++ ../../j2se/src/solaris/native/sun/awt/awt_LoadLibrary.c 9 Oct 2005 05:34:52 -0000
|
||||
@@ -195,8 +195,7 @@
|
||||
}
|
||||
}
|
||||
else {
|
||||
-/* XXXBSD: decide which toolkit to use */
|
||||
-#if defined(__linux)
|
||||
+#if defined(__linux) || defined(_ALLBSD_SOURCE)
|
||||
/* Default AWT Toolkit on Linux is XAWT. */
|
||||
strcpy(p, "/xawt/libmawt");
|
||||
XAWT = 1;
|
@ -1,71 +0,0 @@
|
||||
--- ../../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
|
||||
|
||||
@@ -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,35 +2,8 @@ $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
|
||||
@@ -72,8 +72,8 @@
|
||||
else
|
||||
+OTHER_LDLIBS += -lz
|
||||
ifeq ($(PLATFORM), bsd)
|
||||
ifneq ($(TRUE_PLATFORM), NetBSD)
|
||||
- OTHER_INCLUDES += -I/usr/local/include
|
||||
@ -40,9 +13,3 @@ $FreeBSD$
|
||||
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)
|
||||
|
@ -1,27 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 10 Aug 2005 16:51:14 -0000 1.8
|
||||
+++ ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 21 Sep 2005 02:27:28 -0000 1.9
|
||||
@@ -608,6 +608,8 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#endif /* USE_GETADDRINFO */
|
||||
+
|
||||
#define SET_NONBLOCKING(fd) { \
|
||||
int flags = fcntl(fd, F_GETFL); \
|
||||
flags |= O_NONBLOCK; \
|
||||
@@ -860,6 +862,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#ifndef USE_GETADDRINFO
|
||||
#if defined(_ALLBSD_SOURCE)
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
@@ -1069,4 +1072,4 @@
|
||||
#endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */
|
||||
|
||||
#endif
|
||||
-#endif /* USE_GETADDRINFO */
|
||||
+#endif /* !USE_GETADDRINFO */
|
@ -1,29 +0,0 @@
|
||||
--- ../../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
|
||||
|
@ -1,24 +0,0 @@
|
||||
--- ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Tue Oct 19 14:59:48 2004
|
||||
+++ ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h Sun Oct 16 09:06:04 2005
|
||||
@@ -15,4 +15,8 @@
|
||||
#endif
|
||||
|
||||
+#ifndef NO_ZLIB
|
||||
+# include <zconf.h>
|
||||
+#endif
|
||||
+
|
||||
#ifndef FULL
|
||||
#define FULL 1 /* Adds <500 bytes to the zipped final product. */
|
||||
@@ -70,4 +74,5 @@
|
||||
|
||||
typedef unsigned int uint;
|
||||
+#ifdef NO_ZLIB
|
||||
#ifdef _LP64
|
||||
typedef unsigned int uLong; // Historical zlib, should be 32-bit.
|
||||
@@ -75,4 +80,6 @@
|
||||
typedef unsigned long uLong;
|
||||
#endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef _MSC_VER
|
||||
typedef LONGLONG jlong;
|
@ -1,17 +0,0 @@
|
||||
--- ../../j2se/make/java/zip/FILES_c.gmk Tue Oct 19 14:44:55 2004
|
||||
+++ ../../j2se/make/java/zip/FILES_c.gmk Sat Oct 15 14:51:44 2005
|
||||
@@ -9,14 +9,3 @@
|
||||
$(CTARGDIR)ZipFile.c \
|
||||
$(CTARGDIR)ZipEntry.c \
|
||||
- $(CTARGDIR)zadler32.c \
|
||||
- $(CTARGDIR)zcrc32.c \
|
||||
- $(CTARGDIR)deflate.c \
|
||||
- $(CTARGDIR)trees.c \
|
||||
- $(CTARGDIR)zutil.c \
|
||||
- $(CTARGDIR)inflate.c \
|
||||
- $(CTARGDIR)infblock.c \
|
||||
- $(CTARGDIR)inftrees.c \
|
||||
- $(CTARGDIR)infcodes.c \
|
||||
- $(CTARGDIR)infutil.c \
|
||||
- $(CTARGDIR)inffast.c \
|
||||
$(CTARGDIR)zip_util.c
|
@ -1,19 +0,0 @@
|
||||
--- ../../j2se/make/java/zip/Makefile Tue Oct 19 14:44:55 2004
|
||||
+++ ../../j2se/make/java/zip/Makefile Sat Oct 15 14:02:40 2005
|
||||
@@ -59,11 +59,4 @@
|
||||
endif
|
||||
|
||||
-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)
|
||||
-
|
||||
#
|
||||
# Has been converted to the JNI: generate JNI-style header files
|
||||
@@ -74,3 +67,3 @@
|
||||
# Link to JVM library for JVM_Zip* functions
|
||||
#
|
||||
-OTHER_LDLIBS = $(JVMLIB)
|
||||
+OTHER_LDLIBS = -lz
|
Loading…
Reference in New Issue
Block a user