Sat Dec 15 20:27:45 2018 UTC ()
openjdk8: Re-fix SunOS support.


(jperkin)
diff -r1.64 -r1.65 pkgsrc/lang/openjdk8/distinfo
diff -r1.15 -r1.16 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
diff -r0 -r1.3 pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h
cvs diff -r1.64 -r1.65 pkgsrc/lang/openjdk8/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2018/12/12 16:04:10 1.64
+++ pkgsrc/lang/openjdk8/distinfo 2018/12/15 20:27:45 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.64 2018/12/12 16:04:10 ryoon Exp $ 1$NetBSD: distinfo,v 1.65 2018/12/15 20:27:45 jperkin Exp $
2 2
3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes 6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee 8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2 9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes 10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea 12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d 13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes 14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
@@ -53,27 +53,27 @@ RMD160 (openjdk7/openjdk-1.8.192-2018120 @@ -53,27 +53,27 @@ RMD160 (openjdk7/openjdk-1.8.192-2018120
53SHA512 (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 1453ee1f99b1f8c7a7f279769e48e14eca80f7649b09b518ca47b2fa742f1bfff0b23646639acd4fe33fc0c93c3fe9c7931a87964ba52f609330a536f24008c3 53SHA512 (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 1453ee1f99b1f8c7a7f279769e48e14eca80f7649b09b518ca47b2fa742f1bfff0b23646639acd4fe33fc0c93c3fe9c7931a87964ba52f609330a536f24008c3
54Size (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 55795332 bytes 54Size (openjdk7/openjdk-1.8.192-20181209.tar.xz) = 55795332 bytes
55SHA1 (patch-aa) = b3834c8a8d12a417638e0c5b886abea4767fb7f5 55SHA1 (patch-aa) = b3834c8a8d12a417638e0c5b886abea4767fb7f5
56SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c 56SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
57SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 57SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
58SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 58SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
59SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa 59SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa
60SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 60SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557
61SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 61SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
62SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 62SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
63SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9 63SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
64SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 64SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
65SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462 65SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
66SHA1 (patch-common_autoconf_generated-configure.sh) = bd10cdd8d06c6620cf350df8b5a0e6dd392ef058 66SHA1 (patch-common_autoconf_generated-configure.sh) = bb925091b859f6feea7963b9d99d3c7d6654982f
67SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b 67SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
68SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6 68SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
69SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 69SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
70SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e 70SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e
71SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = cf90f6a3d170aa7291fb3cfe4df7df20ec377132 71SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = cf90f6a3d170aa7291fb3cfe4df7df20ec377132
72SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 72SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
73SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d 73SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
74SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1 74SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
75SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976 75SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
76SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417 76SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
77SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 06d9e495fe7f28b11b169cf4e56d7f8a37944ed7 77SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 06d9e495fe7f28b11b169cf4e56d7f8a37944ed7
78SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39 78SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
79SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b 79SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
@@ -111,26 +111,27 @@ SHA1 (patch-jdk_make_CompileDemos.gmk) = @@ -111,26 +111,27 @@ SHA1 (patch-jdk_make_CompileDemos.gmk) =
111SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090 111SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090
112SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 112SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
113SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 113SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
114SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 114SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
115SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be 115SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be
116SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a 116SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a
117SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d 117SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
118SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4 118SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4
119SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 119SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
120SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b 120SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
121SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606 121SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
122SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317 122SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
123SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50 123SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
 124SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = bd2ef7ea0b2cd9ec8cb637e0c0d4dc3a25021773
124SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4 125SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
125SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 126SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
126SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd 127SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
127SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 128SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
128SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 129SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
129SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 130SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
130SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = 227457d22887347f718b7c28aa6b967378f55e81 131SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = 227457d22887347f718b7c28aa6b967378f55e81
131SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d 132SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
132SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209 133SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
133SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba 134SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
134SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124 135SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
135SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f 136SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
136SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6 137SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
cvs diff -r1.15 -r1.16 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 2018/12/12 14:22:11 1.15
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 2018/12/15 20:27:45 1.16
@@ -1,20 +1,29 @@ @@ -1,20 +1,29 @@
1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.15 2018/12/12 14:22:11 ryoon Exp $ 1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.16 2018/12/15 20:27:45 jperkin Exp $
2 2
3BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and 3BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
4pkg/53223. 4pkg/53223.
5 5
6--- common/autoconf/generated-configure.sh.orig 2018-12-09 09:50:43.000000000 +0000 6--- common/autoconf/generated-configure.sh.orig 2018-12-09 09:50:43.000000000 +0000
7+++ common/autoconf/generated-configure.sh 7+++ common/autoconf/generated-configure.sh
 8@@ -4132,7 +4132,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
 9 # These toolchains are valid on different platforms
 10 VALID_TOOLCHAINS_bsd="clang gcc"
 11 VALID_TOOLCHAINS_linux="gcc clang"
 12-VALID_TOOLCHAINS_solaris="solstudio"
 13+VALID_TOOLCHAINS_solaris="gcc solstudio"
 14 VALID_TOOLCHAINS_macosx="gcc clang"
 15 VALID_TOOLCHAINS_aix="xlc"
 16 VALID_TOOLCHAINS_windows="microsoft"
8@@ -15404,9 +15404,6 @@ done 17@@ -15404,9 +15404,6 @@ done
9 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. 18 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
10 if test "x$MAKE" != x; then 19 if test "x$MAKE" != x; then
11 # User has supplied a make, test it. 20 # User has supplied a make, test it.
12- if test ! -f "$MAKE"; then 21- if test ! -f "$MAKE"; then
13- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 22- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
14- fi 23- fi
15  24
16 MAKE_CANDIDATE=""$MAKE"" 25 MAKE_CANDIDATE=""$MAKE""
17 DESCRIPTION="user supplied MAKE=$MAKE" 26 DESCRIPTION="user supplied MAKE=$MAKE"
18@@ -19994,7 +19991,7 @@ $as_echo "$as_me: Potential Boot JDK fou 27@@ -19994,7 +19991,7 @@ $as_echo "$as_me: Potential Boot JDK fou
19 BOOT_JDK_FOUND=no 28 BOOT_JDK_FOUND=no
20 else 29 else
@@ -212,27 +221,27 @@ pkg/53223. @@ -212,27 +221,27 @@ pkg/53223.
212+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 221+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
213  222
214 # Extra M4 quote needed to protect [] in grep expression. 223 # Extra M4 quote needed to protect [] in grep expression.
215 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 224 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
216@@ -24390,7 +24387,7 @@ $as_echo "$as_me: Potential Boot JDK fou 225@@ -24390,7 +24387,7 @@ $as_echo "$as_me: Potential Boot JDK fou
217 BOOT_JDK_FOUND=no 226 BOOT_JDK_FOUND=no
218 else 227 else
219 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 228 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
220- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 229- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
221+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 230+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
222  231
223 # Extra M4 quote needed to protect [] in grep expression. 232 # Extra M4 quote needed to protect [] in grep expression.
224 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 233 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
225@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk  234@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk
226 # Maximum amount of heap memory. 235 # Maximum amount of heap memory.
227 # Maximum stack size. 236 # Maximum stack size.
228 if test "x$BOOT_JDK_BITS" = x32; then 237 if test "x$BOOT_JDK_BITS" = x32; then
229- JVM_MAX_HEAP=768M 238- JVM_MAX_HEAP=768M
230 STACK_SIZE=768 239 STACK_SIZE=768
231 else 240 else
232 # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 241 # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
233 # pointers are used. Apparently, we need to increase the heap and stack 242 # pointers are used. Apparently, we need to increase the heap and stack
234 # space for the jvm. More specifically, when running javac to build huge 243 # space for the jvm. More specifically, when running javac to build huge
235 # jdk batch 244 # jdk batch
236- JVM_MAX_HEAP=1600M 245- JVM_MAX_HEAP=1600M
237 STACK_SIZE=1536 246 STACK_SIZE=1536
238 fi 247 fi
@@ -266,82 +275,105 @@ pkg/53223. @@ -266,82 +275,105 @@ pkg/53223.
266+ if test "x$ISLINK" = x; then 275+ if test "x$ISLINK" = x; then
267 # This is not a symbolic link! We are done! 276 # This is not a symbolic link! We are done!
268 break 277 break
269 fi 278 fi
270@@ -29530,7 +29526,7 @@ $as_echo_n "checking for resolved symbol 279@@ -29530,7 +29526,7 @@ $as_echo_n "checking for resolved symbol
271 # Resolve file symlinks 280 # Resolve file symlinks
272 while test $COUNTER -lt 20; do 281 while test $COUNTER -lt 20; do
273 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 282 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
274- if test "x$ISLINK" == x; then 283- if test "x$ISLINK" == x; then
275+ if test "x$ISLINK" = x; then 284+ if test "x$ISLINK" = x; then
276 # This is not a symbolic link! We are done! 285 # This is not a symbolic link! We are done!
277 break 286 break
278 fi 287 fi
279@@ -42453,7 +42449,8 @@ $as_echo "alsa pulse x11" >&6; } 288@@ -41214,6 +41210,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
 289 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
 290 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
 291 SET_SHARED_LIBRARY_MAPFILE=''
 292+ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
 293+ SHARED_LIBRARY_FLAGS="-shared"
 294+ SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1'
 295+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
 296+ SET_SHARED_LIBRARY_NAME=''
 297+ SET_SHARED_LIBRARY_MAPFILE=''
 298 else
 299 # Default works for linux, might work on other platforms as well.
 300 SHARED_LIBRARY_FLAGS='-shared'
 301@@ -41262,7 +41264,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
 302 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 303 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
 304 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
 305+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
 306 CFLAGS_JDKLIB_EXTRA='-xstrconst'
 307+ fi
 308 fi
 309 # The (cross) compiler is now configured, we can now test capabilities
 310 # of the target platform.
 311@@ -42453,7 +42457,8 @@ $as_echo "alsa pulse x11" >&6; }
280 if test "x$OPENJDK_TARGET_OS" = xbsd; then 312 if test "x$OPENJDK_TARGET_OS" = xbsd; then
281 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
282 $as_echo_n "checking what is not needed on BSD?... " >&6; } 314 $as_echo_n "checking what is not needed on BSD?... " >&6; }
283- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then 315- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
284+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then 316+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then
285+# XXX revisit this 317+# XXX revisit this
286 ALSA_NOT_NEEDED=yes 318 ALSA_NOT_NEEDED=yes
287 PULSE_NOT_NEEDED=yes 319 PULSE_NOT_NEEDED=yes
288 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 320 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
289@@ -43683,7 +43680,7 @@ $as_echo "$as_me: WARNING: Can't find pr 321@@ -43683,7 +43688,7 @@ $as_echo "$as_me: WARNING: Can't find pr
290 BUILD_FREETYPE=no 322 BUILD_FREETYPE=no
291 fi 323 fi
292 # Now check if configure found a version of 'msbuild.exe' 324 # Now check if configure found a version of 'msbuild.exe'
293- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then 325- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then
294+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then 326+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then
295 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5 327 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
296 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;} 328 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
297 BUILD_FREETYPE=no 329 BUILD_FREETYPE=no
298@@ -44099,7 +44096,11 @@ $as_echo "$as_me: WARNING: --with-freety 330@@ -44099,7 +44104,11 @@ $as_echo "$as_me: WARNING: --with-freety
299  331
300 # Allow --with-freetype-lib and --with-freetype-include to override 332 # Allow --with-freetype-lib and --with-freetype-include to override
301 if test "x$with_freetype_include" != x; then 333 if test "x$with_freetype_include" != x; then
302- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 334- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
303+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 335+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
304+ # deal w/ freetype2 in new location 336+ # deal w/ freetype2 in new location
305+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then 337+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then
306+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2 338+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2
307+ fi 339+ fi
308 fi 340 fi
309 if test "x$with_freetype_lib" != x; then 341 if test "x$with_freetype_lib" != x; then
310 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" 342 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
311@@ -47209,7 +47210,7 @@ $as_echo "$as_me: The path of FREETYPE_I 343@@ -47209,7 +47218,7 @@ $as_echo "$as_me: The path of FREETYPE_I
312 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 344 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
313 fi 345 fi
314  346
315- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then 347- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
316+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then 348+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then
317 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" 349 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
318 else 350 else
319 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" 351 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
320@@ -47342,7 +47343,7 @@ $as_echo "$as_me: The path of FREETYPE_L 352@@ -47342,7 +47351,7 @@ $as_echo "$as_me: The path of FREETYPE_L
321 if test "x$OPENJDK_TARGET_OS" = xwindows; then 353 if test "x$OPENJDK_TARGET_OS" = xwindows; then
322 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" 354 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
323 else 355 else
324- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype" 356- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
325+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype" 357+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype"
326 fi 358 fi
327 fi 359 fi
328  360
329@@ -48571,9 +48572,6 @@ fi 361@@ -48571,9 +48580,6 @@ fi
330  362
331  363
332  364
333- if test "x$LLVM_CONFIG" != xllvm-config; then 365- if test "x$LLVM_CONFIG" != xllvm-config; then
334- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5 366- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
335- fi 367- fi
336  368
337 llvm_components="jit mcjit engine nativecodegen native" 369 llvm_components="jit mcjit engine nativecodegen native"
338 unset LLVM_CFLAGS 370 unset LLVM_CFLAGS
339@@ -48616,7 +48614,7 @@ fi 371@@ -48616,7 +48622,7 @@ fi
340 fi 372 fi
341  373
342 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) 374 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
343- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then 375- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
344+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then 376+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then
345 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" 377 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
346 fi 378 fi
347  379
File Added: pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h
$NetBSD: patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h,v 1.3 2018/12/15 20:27:45 jperkin Exp $

Set _POSIX_SOURCE correctly.

--- jdk/src/share/native/sun/awt/libpng/pngpriv.h.orig	2018-12-09 09:51:37.000000000 +0000
+++ jdk/src/share/native/sun/awt/libpng/pngpriv.h
@@ -63,7 +63,7 @@
  * Windows/Visual Studio) there is no effect; the OS specific tests below are
  * still required (as of 2011-05-02.)
  */
-#ifndef _POSIX_SOURCE
+#if (!defined(__sun) || (__STDC_VERSION__-0 < 199901L)) && !defined(_POSIX_SOURCE)
 # define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
 #endif