Sun Mar 1 21:44:29 2015 UTC ()
Rototil include order so stdint doesn't get included without the necessary
feature test macros. Should fix "UINTPTR_MAX not declared" error.


(tnn)
diff -r1.78 -r1.79 pkgsrc/lang/openjdk7/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
cvs diff -r1.78 -r1.79 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2015/02/23 13:34:56 1.78
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2015/03/01 21:44:29 1.79
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.78 2015/02/23 13:34:56 tnn Exp $ 1$NetBSD: distinfo,v 1.79 2015/03/01 21:44:29 tnn Exp $
2 2
3SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 3SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
4RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 4RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
5Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes 5Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
6SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 6SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
7RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 7RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
8Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes 8Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d 9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes 11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
12SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931 12SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931
13RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa 13RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa
14Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes 14Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes
@@ -91,28 +91,29 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zer @@ -91,28 +91,29 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zer
91SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 91SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
92SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c 92SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
93SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 93SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41
94SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b 94SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
95SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 95SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
96SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2 96SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
97SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 97SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
98SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 98SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
99SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 99SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
100SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738 100SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738
101SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553 101SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
102SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15 102SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15
103SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b 103SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
104SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 104SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7b2b1808dd819b3cd3f84121ddd169421231d98b
105SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e 105SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
 106SHA1 (patch-hotspot_src_share_vm_utilities_vmError.cpp) = 071f44a1ce8ecc2871067cb9758d481dad4af07d
106SHA1 (patch-jaxp_build.xml) = 3c539e2667a7ba86f1034607b3dc67fe7f14267a 107SHA1 (patch-jaxp_build.xml) = 3c539e2667a7ba86f1034607b3dc67fe7f14267a
107SHA1 (patch-jaxp_make_Makefile) = 4e65defb4ccd973cc13f343cf5931781c6091d51 108SHA1 (patch-jaxp_make_Makefile) = 4e65defb4ccd973cc13f343cf5931781c6091d51
108SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2 109SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2
109SHA1 (patch-jaxws_make_Makefile) = fcaa667aa1187fd4f8f639d625c22f7a43abb642 110SHA1 (patch-jaxws_make_Makefile) = fcaa667aa1187fd4f8f639d625c22f7a43abb642
110SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b 111SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
111SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 112SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
112SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 697467f606ff6a13127ea9027018ca401d354e58 113SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 697467f606ff6a13127ea9027018ca401d354e58
113SHA1 (patch-jdk_make_com_sun_nio_Makefile) = ab2ce3fd1a1a8ad6009d81025cc07077abe9a048 114SHA1 (patch-jdk_make_com_sun_nio_Makefile) = ab2ce3fd1a1a8ad6009d81025cc07077abe9a048
114SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 115SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
115SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 116SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
116SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 117SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
117SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 118SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
118SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239 119SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp 2014/01/02 01:16:35 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp 2015/03/01 21:44:29 1.4
@@ -1,35 +1,51 @@ @@ -1,35 +1,51 @@
1$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2014/01/02 01:16:35 ryoon Exp $ 1$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2015/03/01 21:44:29 tnn Exp $
2 2
3SunOS fixes. 3--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2015-01-26 15:21:49.000000000 +0000
4 
5--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2014-01-01 05:50:08.000000000 +0000 
6+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 4+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
7@@ -31,6 +31,10 @@ 5@@ -31,6 +31,16 @@
8 // globally used constants & types, class (forward) 6 // globally used constants & types, class (forward)
9 // declarations and a few frequently used utility functions. 7 // declarations and a few frequently used utility functions.
10  8
11+#ifdef SOLARIS 9+#ifndef __STDC_CONSTANT_MACROS
12+#include <inttypes.h> 10+#define __STDC_CONSTANT_MACROS
13+#endif // SOLARIS 11+#endif
 12+#ifndef __STDC_FORMAT_MACROS
 13+#define __STDC_FORMAT_MACROS
 14+#endif
 15+#ifndef __STDC_LIMIT_MACROS
 16+#define __STDC_LIMIT_MACROS
 17+#endif
14+ 18+
15 #include <ctype.h> 19 #include <ctype.h>
16 #include <string.h> 20 #include <string.h>
17 #include <stdarg.h> 21 #include <stdarg.h>
18@@ -241,6 +245,7 @@ extern "C" void breakpoint(); 22@@ -76,10 +86,7 @@
 23 # include <sys/procfs.h>
 24 # endif
 25
 26-#if defined(LINUX) || defined(_ALLBSD_SOURCE)
 27-#ifndef __STDC_LIMIT_MACROS
 28-#define __STDC_LIMIT_MACROS
 29-#endif // __STDC_LIMIT_MACROS
 30+#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
 31 #include <inttypes.h>
 32 #include <signal.h>
 33 #ifndef __OpenBSD__
 34@@ -241,6 +248,7 @@ extern "C" void breakpoint();
19 #define BREAKPOINT ::breakpoint() 35 #define BREAKPOINT ::breakpoint()
20 #endif 36 #endif
21  37
22+#include <sys/param.h> /* for __DragonFly_version */ 38+#include <sys/param.h> /* for __DragonFly_version */
23 // checking for nanness 39 // checking for nanness
24 #ifdef SOLARIS 40 #ifdef SOLARIS
25 #ifdef SPARC 41 #ifdef SPARC
26@@ -252,6 +257,9 @@ inline int g_isnan(float f) { return is 42@@ -252,6 +260,9 @@ inline int g_isnan(float f) { return is
27 inline int g_isnan(double f) { return isnand(f); } 43 inline int g_isnan(double f) { return isnand(f); }
28 #elif defined(__APPLE__) 44 #elif defined(__APPLE__)
29 inline int g_isnan(double f) { return isnan(f); } 45 inline int g_isnan(double f) { return isnan(f); }
30+#elif defined(__DragonFly__) && __DragonFly_version < 300500 46+#elif defined(__DragonFly__) && __DragonFly_version < 300500
31+inline int g_isnan(float f) { return __isnanf(f); } 47+inline int g_isnan(float f) { return __isnanf(f); }
32+inline int g_isnan(double f) { return __isnand(f); } 48+inline int g_isnan(double f) { return __isnand(f); }
33 #elif defined(LINUX) || defined(_ALLBSD_SOURCE) 49 #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
34 inline int g_isnan(float f) { return isnanf(f); } 50 inline int g_isnan(float f) { return isnanf(f); }
35 inline int g_isnan(double f) { return isnan(f); } 51 inline int g_isnan(double f) { return isnan(f); }
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_utilities_vmError.cpp
$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"