diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk14/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk14/files/patch-vm::os_bsd.hpp | 13 | ||||
| -rw-r--r-- | java/jdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk15/files/patch-vm::os_bsd.hpp | 13 | ||||
| -rw-r--r-- | java/jdk16/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk16/files/patch-vm::os_bsd.hpp | 13 |
6 files changed, 42 insertions, 3 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index ec0d3e413123..337da810e227 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk14/files/patch-vm::os_bsd.hpp b/java/jdk14/files/patch-vm::os_bsd.hpp new file mode 100644 index 000000000000..cab94f46e4d3 --- /dev/null +++ b/java/jdk14/files/patch-vm::os_bsd.hpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot/src/os/bsd/vm/os_bsd.hpp.orig Wed Oct 20 16:01:08 2004 ++++ ../../hotspot/src/os/bsd/vm/os_bsd.hpp Wed Oct 20 16:01:30 2004 +@@ -353,7 +353,7 @@ + bool trylock() { + verify(); + int status = pthread_mutex_trylock(_mutex); +- if (status == EBUSY) ++ if (status == EBUSY || status == EDEADLK) + return false; + assert(status == 0, "pthread_mutex_trylock"); + #ifndef PRODUCT diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index ec0d3e413123..337da810e227 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk15/files/patch-vm::os_bsd.hpp b/java/jdk15/files/patch-vm::os_bsd.hpp new file mode 100644 index 000000000000..cab94f46e4d3 --- /dev/null +++ b/java/jdk15/files/patch-vm::os_bsd.hpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot/src/os/bsd/vm/os_bsd.hpp.orig Wed Oct 20 16:01:08 2004 ++++ ../../hotspot/src/os/bsd/vm/os_bsd.hpp Wed Oct 20 16:01:30 2004 +@@ -353,7 +353,7 @@ + bool trylock() { + verify(); + int status = pthread_mutex_trylock(_mutex); +- if (status == EBUSY) ++ if (status == EBUSY || status == EDEADLK) + return false; + assert(status == 0, "pthread_mutex_trylock"); + #ifndef PRODUCT diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index ec0d3e413123..337da810e227 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk16/files/patch-vm::os_bsd.hpp b/java/jdk16/files/patch-vm::os_bsd.hpp new file mode 100644 index 000000000000..cab94f46e4d3 --- /dev/null +++ b/java/jdk16/files/patch-vm::os_bsd.hpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot/src/os/bsd/vm/os_bsd.hpp.orig Wed Oct 20 16:01:08 2004 ++++ ../../hotspot/src/os/bsd/vm/os_bsd.hpp Wed Oct 20 16:01:30 2004 +@@ -353,7 +353,7 @@ + bool trylock() { + verify(); + int status = pthread_mutex_trylock(_mutex); +- if (status == EBUSY) ++ if (status == EBUSY || status == EDEADLK) + return false; + assert(status == 0, "pthread_mutex_trylock"); + #ifndef PRODUCT |