diff options
-rw-r--r-- | lang/openjdk7/distinfo | 4 | ||||
-rw-r--r-- | lang/openjdk7/options.mk | 6 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-aa | 41 |
3 files changed, 43 insertions, 8 deletions
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 8e4b5ea138d..5e1ad5e2a9e 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.38 2014/01/08 13:09:38 jperkin Exp $ +$NetBSD: distinfo,v 1.39 2014/01/14 17:24:42 abs Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -64,7 +64,7 @@ SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 -SHA1 (patch-aa) = 656265823146be3fd6efee470fccff5fdc4b2a59 +SHA1 (patch-aa) = 69da3f571d37bb461f1d3edb342a56e63a2872af SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk index 28b1e025431..a22a3da348c 100644 --- a/lang/openjdk7/options.mk +++ b/lang/openjdk7/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2011/08/21 22:57:54 tnn Exp $ +# $NetBSD: options.mk,v 1.4 2014/01/14 17:24:42 abs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 PKG_SUPPORTED_OPTIONS= sun-jre-jce # jdk-zero-vm @@ -16,7 +16,7 @@ EXTRACT_ONLY+= ${JCE_DISTFILE} PLIST.jce= yes USE_TOOLS+= pax # -.if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}) +. if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}) FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited" FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:" FETCH_MESSAGE+= " http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" @@ -24,7 +24,7 @@ FETCH_MESSAGE+= " and place it in:" FETCH_MESSAGE+= " ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}" FETCH_MESSAGE+= "" FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again." -.endif +. endif # post-install: cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa index 7aefcdcfe2e..4350f377c58 100644 --- a/lang/openjdk7/patches/patch-aa +++ b/lang/openjdk7/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.10 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs 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 @@ -55,7 +56,41 @@ DragonFly support. {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"}, -@@ -3880,7 +3883,7 @@ OSReturn os::set_native_priority(Thread* +@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s + + #else + ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) ++static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { ++ struct timespec onems = { 0, 1000000 }; ++ struct timespec total = { 0, 0 }; ++ struct timespec unslept; ++ struct timespec elapsed; ++ struct timespec tmp; ++ ++ while (timespeccmp(ts, &total, >)) { ++ if (sem_trywait(sem) == 0) ++ return 0; ++ ++ if (errno != EAGAIN) ++ return -1; ++ ++ (void)nanosleep(&onems, &unslept); ++ ++ timespecsub(&onems, &unslept, &elapsed); ++ timespecadd(&total, &elapsed, &tmp); ++ total.tv_sec = tmp.tv_sec; ++ total.tv_nsec = tmp.tv_nsec; ++ } ++ errno = ETIMEDOUT; ++ return -1; ++} ++#endif /* __NetBSD__ */ ++ + bool Semaphore::trywait() { + return sem_trywait(&_semaphore) == 0; + } +@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread* #ifdef __OpenBSD__ // OpenBSD pthread_setprio starves low priority threads return OS_OK; @@ -64,7 +99,7 @@ DragonFly support. int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); return (ret == 0) ? OS_OK : OS_ERR; #elif defined(__APPLE__) || defined(__NetBSD__) -@@ -3909,7 +3912,7 @@ OSReturn os::get_native_priority(const T +@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T } errno = 0; |