diff options
author | ryoon <ryoon@pkgsrc.org> | 2014-07-25 20:35:14 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2014-07-25 20:35:14 +0000 |
commit | 31cbd4ed7b4471ae8c74734c35dc77f077ca5fbd (patch) | |
tree | d6ca0d0826e4d30ab9a29007c628475f12b429a3 /lang/openjdk7/patches | |
parent | 602ded599f63c8fe403b24731e2741f5d28b6949 (diff) | |
download | pkgsrc-31cbd4ed7b4471ae8c74734c35dc77f077ca5fbd.tar.gz |
Bump PKGREVISION
* Use working bootstrap kits for DragonFly from DPorts.
* Borrow patches from DragonFly Dports.
Fix build under DragonFly 3.6.2 and 3.8.1.
Diffstat (limited to 'lang/openjdk7/patches')
7 files changed, 101 insertions, 12 deletions
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa index 4350f377c58..b409ba52bcc 100644 --- a/lang/openjdk7/patches/patch-aa +++ b/lang/openjdk7/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs Exp $ +$NetBSD: patch-aa,v 1.12 2014/07/25 20:35:14 ryoon Exp $ DragonFly support. Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-01-01 05:50:05.000000000 +0000 +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-06-14 20:38:20.000000000 +0000 +++ hotspot/src/os/bsd/vm/os_bsd.cpp @@ -126,8 +126,11 @@ # include <inttypes.h> @@ -26,7 +26,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 /* get processors count via hw.ncpus sysctl */ mib[0] = CTL_HW; -@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() { +@@ -372,14 +376,11 @@ void os::Bsd::initialize_system_info() { _physical_memory = 256*1024*1024; // fallback (XXXBSD?) } @@ -46,7 +46,16 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 #endif } #else -@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename +@@ -458,7 +459,7 @@ void os::init_system_properties_values() + * 7: The default directories, normally /lib and /usr/lib. + */ + #ifndef DEFAULT_LIBPATH +-#define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib:@PREFIX@/lib" + #endif + + #define EXTENSIONS_DIR "/lib/ext" +@@ -2224,7 +2225,9 @@ void * os::dll_load(const char *filename {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -56,7 +65,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, -@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s +@@ -2820,6 +2823,33 @@ bool Semaphore::timedwait(unsigned int s #else @@ -90,7 +99,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 bool Semaphore::trywait() { return sem_trywait(&_semaphore) == 0; } -@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread* +@@ -3884,7 +3914,7 @@ OSReturn os::set_native_priority(Thread* #ifdef __OpenBSD__ // OpenBSD pthread_setprio starves low priority threads return OS_OK; @@ -99,7 +108,7 @@ Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); return (ret == 0) ? OS_OK : OS_ERR; #elif defined(__APPLE__) || defined(__NetBSD__) -@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T +@@ -3913,7 +3943,7 @@ OSReturn os::get_native_priority(const T } errno = 0; diff --git a/lang/openjdk7/patches/patch-ak b/lang/openjdk7/patches/patch-ak index d5aab951bef..38d7a39bb60 100644 --- a/lang/openjdk7/patches/patch-ak +++ b/lang/openjdk7/patches/patch-ak @@ -1,10 +1,10 @@ -$NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ak,v 1.7 2014/07/25 20:35:14 ryoon Exp $ Additional rpaths. ---- jdk/make/common/Defs-bsd.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +--- jdk/make/common/Defs-bsd.gmk.orig 2014-06-14 20:38:28.000000000 +0000 +++ jdk/make/common/Defs-bsd.gmk -@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink +@@ -328,8 +328,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) @@ -15,7 +15,19 @@ Additional rpaths. # # -L paths for finding and -ljava -@@ -399,7 +399,7 @@ endif +@@ -380,6 +380,11 @@ endif + + # Using map files currently break compilation on FreeBSD during shared library + # checks for some of the AWT native libraries. ++ifeq ($(OS_VENDOR), DragonFly) ++LDNOMAP=true ++endif ++ ++# + ifeq ($(OS_VENDOR), FreeBSD) + LDNOMAP=true + endif +@@ -391,7 +396,7 @@ endif # the library itself should not. # VM_NAME = server @@ -24,7 +36,7 @@ Additional rpaths. JAVALIB = -ljava $(JVMLIB) # -@@ -462,6 +462,14 @@ ifeq ($(OS_VENDOR), OpenBSD) +@@ -454,6 +459,14 @@ ifeq ($(OS_VENDOR), OpenBSD) SYSTEM_ZLIB = true endif diff --git a/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java b/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java new file mode 100644 index 00000000000..f4d7d56473b --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java @@ -0,0 +1,13 @@ +$NetBSD: patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java,v 1.1 2014/07/25 20:35:14 ryoon Exp $ + +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.orig 2014-06-14 20:38:20.000000000 +0000 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java +@@ -45,6 +45,8 @@ public class PlatformInfo { + return "bsd"; + } else if (os.equals("Darwin") || os.contains("OS X")) { + return "bsd"; ++ } else if (os.equals("DragonFlyBSD")) { ++ return "bsd"; + } else if (os.startsWith("Windows")) { + return "win32"; + } else { diff --git a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk new file mode 100644 index 00000000000..0af5912b323 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk @@ -0,0 +1,13 @@ +$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.1 2014/07/25 20:35:14 ryoon Exp $ + +--- jdk/make/java/net/FILES_c.gmk.orig 2014-06-14 20:38:28.000000000 +0000 ++++ jdk/make/java/net/FILES_c.gmk +@@ -44,7 +44,7 @@ ifeq ($(PLATFORM), linux) + FILES_c += linux_close.c + endif + +-ifeq ($(PLATFORM), macosx) ++ifeq ($(PLATFORM), bsd) + FILES_c += bsd_close.c + endif + diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c new file mode 100644 index 00000000000..00d99080a51 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c @@ -0,0 +1,16 @@ +$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.1 2014/07/25 20:35:14 ryoon Exp $ + +--- jdk/src/solaris/native/java/lang/java_props_md.c.orig 2014-06-14 20:38:31.000000000 +0000 ++++ jdk/src/solaris/native/java/lang/java_props_md.c +@@ -476,6 +476,11 @@ GetJavaProperties(JNIEnv *env) + { + #ifdef MACOSX + setOSNameAndVersion(&sprops); ++#elif defined(__DragonFly__) ++ struct utsname name; ++ uname(&name); ++ sprops.os_name = "DragonFlyBSD"; ++ sprops.os_version = strdup(name.release); + #else + struct utsname name; + uname(&name); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h new file mode 100644 index 00000000000..aa7384b1c80 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h @@ -0,0 +1,13 @@ +$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.h,v 1.1 2014/07/25 20:35:14 ryoon Exp $ + +--- jdk/src/solaris/native/java/net/net_util_md.h.orig 2014-06-14 20:38:31.000000000 +0000 ++++ jdk/src/solaris/native/java/net/net_util_md.h +@@ -37,7 +37,7 @@ + #endif + + +-#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined(__DragonFly__) + extern int NET_Timeout(int s, long timeout); + extern int NET_Read(int s, void* buf, size_t len); + extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, diff --git a/lang/openjdk7/patches/patch-jdk_test_jprt.config b/lang/openjdk7/patches/patch-jdk_test_jprt.config new file mode 100644 index 00000000000..1008c3fc9f0 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_test_jprt.config @@ -0,0 +1,13 @@ +$NetBSD: patch-jdk_test_jprt.config,v 1.1 2014/07/25 20:35:14 ryoon Exp $ + +--- jdk/test/jprt.config.orig 2014-06-14 20:38:33.000000000 +0000 ++++ jdk/test/jprt.config +@@ -109,7 +109,7 @@ case "${osname}" in + umask 002 + ;; + +- FreeBSD | OpenBSD ) ++ DragonFly | FreeBSD | OpenBSD ) + # Add basic paths + path4sdk=/usr/bin:/bin:/usr/sbin:/sbin + |