diff options
Diffstat (limited to 'java/jdk16/files')
-rw-r--r-- | java/jdk16/files/disable-ipv6.patch | 15 | ||||
-rw-r--r-- | java/jdk16/files/patch-deploy::Makefile | 46 | ||||
-rw-r--r-- | java/jdk16/files/patch-vm::os_bsd.cpp | 13 |
3 files changed, 74 insertions, 0 deletions
diff --git a/java/jdk16/files/disable-ipv6.patch b/java/jdk16/files/disable-ipv6.patch new file mode 100644 index 000000000000..00ecbef516f5 --- /dev/null +++ b/java/jdk16/files/disable-ipv6.patch @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig Tue Jan 27 17:31:03 2004 ++++ ../../j2se/src/solaris/native/java/net/net_util_md.c Tue Jan 27 17:31:38 2004 +@@ -166,6 +166,10 @@ + int fd; + void *ipv6_fn; + ++#ifdef __FreeBSD__ ++ return JNI_FALSE; ++#endif ++ + fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ; + if (fd < 0) { + /* diff --git a/java/jdk16/files/patch-deploy::Makefile b/java/jdk16/files/patch-deploy::Makefile new file mode 100644 index 000000000000..a34bfa0c9d71 --- /dev/null +++ b/java/jdk16/files/patch-deploy::Makefile @@ -0,0 +1,46 @@ +$FreeBSD$ + +--- ../../deploy/make/Makefile.orig Tue Jan 27 18:54:56 2004 ++++ ../../deploy/make/Makefile Tue Jan 27 18:58:08 2004 +@@ -24,17 +24,29 @@ + DEPLOY_TOPDIR=.. + include $(BUILDDIR)/common/Defs.gmk + ++ifdef NO_PLUGIN ++BUILD_PLUGIN= false ++else ++BUILD_PLUGIN= true ++endif ++ ++ifdef NO_JAVAWS ++BUILD_JAVAWS= false ++else ++BUILD_JAVAWS= true ++endif ++ + all:: + @$(ECHO) "$(PLATFORM) $(ARCH) $(RELEASE) deploy build started: $(shell $(DATE) '+%y-%m-%d %H:%M')" + +-BUILD_PLUGIN = true +- + # + # Core. + # + JAVAWS_SUBDIR = javaws + PLUGIN_SUBDIR = plugin ++ifeq ($(BUILD_JAVAWS), true) + SUBDIRS = $(JAVAWS_SUBDIR) ++endif + ifeq ($(BUILD_PLUGIN), true) + SUBDIR += $(PLUGIN_SUBDIR) + endif +@@ -47,7 +59,9 @@ + done + + javaws-all: sanity-javaws ++ ifeq ($(BUILD_JAVAWS), true) + $(CD) $(BUILDDIR)/javaws ; $(MAKE) installer-int dev-all doc aubundle ++ endif + + plugin-all: sanity-plugin + ifeq ($(BUILD_PLUGIN), true) diff --git a/java/jdk16/files/patch-vm::os_bsd.cpp b/java/jdk16/files/patch-vm::os_bsd.cpp new file mode 100644 index 000000000000..25bd71db866c --- /dev/null +++ b/java/jdk16/files/patch-vm::os_bsd.cpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Jan 27 17:54:28 2004 ++++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jan 27 17:55:21 2004 +@@ -333,7 +333,7 @@ + #define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n)) + #define getenv(n) ::getenv(n) + +-#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ ++#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ + #define EXTENSIONS_DIR "/lib/ext" + #define ENDORSED_DIR "/lib/endorsed" + |