diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-06-26 12:52:34 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-06-26 12:52:34 +0000 |
commit | c46dc0a97e0a98aa998fdbb19951d333ac64634c (patch) | |
tree | ac911558e73aec39f51d170e5cbd4b1567e889ce /lang/openjdk7/patches | |
parent | 40fede014853fc2d99656be1f03fbb89297ea6bb (diff) | |
download | pkgsrc-c46dc0a97e0a98aa998fdbb19951d333ac64634c.tar.gz |
Bump PKGREVISION.
* Fix build on DragonFly 3.4.1 and 3.5-DEVELOPMENT.
Use newer bootstrap binary for DragonFly.
* DragonFly 3.5 switches to FreeBSD style math.h.
Add conditional.
I have no idea about build on very recent DragonFly 3.5.
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp index c4a1c212dfe..199d66f7782 100644 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp +++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp @@ -1,8 +1,8 @@ -$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.2 2013/06/26 12:52:35 ryoon Exp $ SunOS fixes. ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2013-02-19 23:21:59.000000000 +0000 +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2013-06-25 13:37:39.000000000 +0000 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp @@ -31,6 +31,10 @@ // globally used constants & types, class (forward) @@ -15,3 +15,20 @@ SunOS fixes. #include <ctype.h> #include <string.h> #include <stdarg.h> +@@ -241,6 +245,7 @@ extern "C" void breakpoint(); + #define BREAKPOINT ::breakpoint() + #endif + ++#include <sys/param.h> /* for __DragonFly_version */ + // checking for nanness + #ifdef SOLARIS + #ifdef SPARC +@@ -252,7 +257,7 @@ inline int g_isnan(float f) { return is + inline int g_isnan(double f) { return isnand(f); } + #elif defined(__APPLE__) + inline int g_isnan(double f) { return isnan(f); } +-#elif defined(__DragonFly__) ++#elif defined(__DragonFly__) && __DragonFly_version < 300500 + inline int g_isnan(float f) { return __isnanf(f); } + inline int g_isnan(double f) { return __isnand(f); } + #elif defined(LINUX) || defined(_ALLBSD_SOURCE) |