diff options
| author | tnn <tnn> | 2015-03-01 21:43:50 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-01 21:43:50 +0000 |
| commit | e4af0b85636f9936d73e810fd1116c90c79948ff (patch) | |
| tree | 494b9981c3072342723e7b10911edac13a1ae3a4 /lang/openjdk8/patches | |
| parent | 5577b1302b008c6dc1b8de33290aeb51aae74390 (diff) | |
| download | pkgsrc-e4af0b85636f9936d73e810fd1116c90c79948ff.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/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp | 33 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp | 14 |
2 files changed, 47 insertions, 0 deletions
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp new file mode 100644 index 00000000000..9d12d56ccfa --- /dev/null +++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp @@ -0,0 +1,33 @@ +$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.1 2015/03/01 21:43:50 tnn Exp $ + +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2015-02-02 15:32:37.000000000 +0000 ++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp +@@ -31,6 +31,16 @@ + // globally used constants & types, class (forward) + // declarations and a few frequently used utility functions. + ++#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> +@@ -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__ diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp new file mode 100644 index 00000000000..14a2d892f50 --- /dev/null +++ b/lang/openjdk8/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:43:50 tnn Exp $ + +Don't include system headers before setting feature test macros. + +--- hotspot/src/share/vm/utilities/vmError.cpp.orig 2015-02-02 15:32:37.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" |