diff options
author | tnn <tnn@pkgsrc.org> | 2015-03-01 21:43:50 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-03-01 21:43:50 +0000 |
commit | f94702d1b71f9209dd080aef18e524d6c4645467 (patch) | |
tree | 494b9981c3072342723e7b10911edac13a1ae3a4 /lang/openjdk7/patches | |
parent | 5abf9c7bceb05594ef7795a3aeff6c23c959c8a7 (diff) | |
download | pkgsrc-f94702d1b71f9209dd080aef18e524d6c4645467.tar.gz |
Rototil include order so stdint doesn't get included without the necessary
feature test macros. Should fix "UINTPTR_MAX not declared" error.
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp | 36 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp | 14 |
2 files changed, 40 insertions, 10 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 85f0da401d0..ef262e7f848 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,21 +1,37 @@ -$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2015/03/01 21:44:29 tnn Exp $ -SunOS fixes. - ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2014-01-01 05:50:08.000000000 +0000 +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2015-01-26 15:21:49.000000000 +0000 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -@@ -31,6 +31,10 @@ +@@ -31,6 +31,16 @@ // globally used constants & types, class (forward) // declarations and a few frequently used utility functions. -+#ifdef SOLARIS -+#include <inttypes.h> -+#endif // SOLARIS ++#ifndef __STDC_CONSTANT_MACROS ++#define __STDC_CONSTANT_MACROS ++#endif ++#ifndef __STDC_FORMAT_MACROS ++#define __STDC_FORMAT_MACROS ++#endif ++#ifndef __STDC_LIMIT_MACROS ++#define __STDC_LIMIT_MACROS ++#endif + #include <ctype.h> #include <string.h> #include <stdarg.h> -@@ -241,6 +245,7 @@ extern "C" void breakpoint(); +@@ -76,10 +86,7 @@ + # include <sys/procfs.h> + # endif + +-#if defined(LINUX) || defined(_ALLBSD_SOURCE) +-#ifndef __STDC_LIMIT_MACROS +-#define __STDC_LIMIT_MACROS +-#endif // __STDC_LIMIT_MACROS ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS) + #include <inttypes.h> + #include <signal.h> + #ifndef __OpenBSD__ +@@ -241,6 +248,7 @@ extern "C" void breakpoint(); #define BREAKPOINT ::breakpoint() #endif @@ -23,7 +39,7 @@ SunOS fixes. // checking for nanness #ifdef SOLARIS #ifdef SPARC -@@ -252,6 +257,9 @@ inline int g_isnan(float f) { return is +@@ -252,6 +260,9 @@ 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); } diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp new file mode 100644 index 00000000000..25b8cf9a9cb --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-hotspot_src_share_vm_utilities_vmError.cpp,v 1.1 2015/03/01 21:44:29 tnn Exp $ + +Don't include system headers before setting feature test macros. + +--- hotspot/src/share/vm/utilities/vmError.cpp.orig 2015-01-26 15:21:49.000000000 +0000 ++++ hotspot/src/share/vm/utilities/vmError.cpp +@@ -22,7 +22,6 @@ + * + */ + +-#include <fcntl.h> + #include "precompiled.hpp" + #include "compiler/compileBroker.hpp" + #include "gc_interface/collectedHeap.hpp" |