Sun Feb 24 16:43:28 2019 UTC ()
openjdk8: Disable relro on SunOS.


(jperkin)
diff -r1.67 -r1.68 pkgsrc/lang/openjdk8/distinfo
diff -r1.16 -r1.17 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
cvs diff -r1.67 -r1.68 pkgsrc/lang/openjdk8/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2019/02/19 17:04:53 1.67
+++ pkgsrc/lang/openjdk8/distinfo 2019/02/24 16:43:28 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.67 2019/02/19 17:04:53 ryoon Exp $ 1$NetBSD: distinfo,v 1.68 2019/02/24 16:43:28 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.202-2019021 @@ -53,27 +53,27 @@ RMD160 (openjdk7/openjdk-1.8.202-2019021
53SHA512 (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 3a8944e69d74439765010bc58ea191a471af22be135835d0cc25e550acd506d08c7dcbbcfecd8280ce85e1624aec91da843b2d36abae0d11af272fcf6d672120 53SHA512 (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 3a8944e69d74439765010bc58ea191a471af22be135835d0cc25e550acd506d08c7dcbbcfecd8280ce85e1624aec91da843b2d36abae0d11af272fcf6d672120
54Size (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 55869224 bytes 54Size (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 55869224 bytes
55SHA1 (patch-aa) = 37b2d569fac98c2a66433f2c27a462c6d565000c 55SHA1 (patch-aa) = 37b2d569fac98c2a66433f2c27a462c6d565000c
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) = bb925091b859f6feea7963b9d99d3c7d6654982f 66SHA1 (patch-common_autoconf_generated-configure.sh) = ef90427a50ceef8b3761a44a4456a3da5348867e
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
cvs diff -r1.16 -r1.17 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/15 20:27:45 1.16
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 2019/02/24 16:43:28 1.17
@@ -1,379 +1,388 @@ @@ -1,379 +1,388 @@
1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.16 2018/12/15 20:27:45 jperkin Exp $ 1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.17 2019/02/24 16:43:28 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 2019-02-19 13:34:21.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 8@@ -4137,7 +4137,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
9 # These toolchains are valid on different platforms 9 # These toolchains are valid on different platforms
10 VALID_TOOLCHAINS_bsd="clang gcc" 10 VALID_TOOLCHAINS_bsd="clang gcc"
11 VALID_TOOLCHAINS_linux="gcc clang" 11 VALID_TOOLCHAINS_linux="gcc clang"
12-VALID_TOOLCHAINS_solaris="solstudio" 12-VALID_TOOLCHAINS_solaris="solstudio"
13+VALID_TOOLCHAINS_solaris="gcc solstudio" 13+VALID_TOOLCHAINS_solaris="gcc solstudio"
14 VALID_TOOLCHAINS_macosx="gcc clang" 14 VALID_TOOLCHAINS_macosx="gcc clang"
15 VALID_TOOLCHAINS_aix="xlc" 15 VALID_TOOLCHAINS_aix="xlc"
16 VALID_TOOLCHAINS_windows="microsoft" 16 VALID_TOOLCHAINS_windows="microsoft"
17@@ -15404,9 +15404,6 @@ done 17@@ -15416,9 +15416,6 @@ done
18 # 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.
19 if test "x$MAKE" != x; then 19 if test "x$MAKE" != x; then
20 # User has supplied a make, test it. 20 # User has supplied a make, test it.
21- if test ! -f "$MAKE"; then 21- if test ! -f "$MAKE"; then
22- 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
23- fi 23- fi
24  24
25 MAKE_CANDIDATE=""$MAKE"" 25 MAKE_CANDIDATE=""$MAKE""
26 DESCRIPTION="user supplied MAKE=$MAKE" 26 DESCRIPTION="user supplied MAKE=$MAKE"
27@@ -19994,7 +19991,7 @@ $as_echo "$as_me: Potential Boot JDK fou 27@@ -20006,7 +20003,7 @@ $as_echo "$as_me: Potential Boot JDK fou
28 BOOT_JDK_FOUND=no 28 BOOT_JDK_FOUND=no
29 else 29 else
30 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 30 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
31- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 31- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
32+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 32+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
33  33
34 # Extra M4 quote needed to protect [] in grep expression. 34 # Extra M4 quote needed to protect [] in grep expression.
35 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 35 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
36@@ -20326,7 +20323,7 @@ $as_echo "$as_me: Potential Boot JDK fou 36@@ -20338,7 +20335,7 @@ $as_echo "$as_me: Potential Boot JDK fou
37 BOOT_JDK_FOUND=no 37 BOOT_JDK_FOUND=no
38 else 38 else
39 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 39 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
40- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 40- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
41+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 41+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
42  42
43 # Extra M4 quote needed to protect [] in grep expression. 43 # Extra M4 quote needed to protect [] in grep expression.
44 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 44 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
45@@ -20644,7 +20641,7 @@ $as_echo "$as_me: Potential Boot JDK fou 45@@ -20656,7 +20653,7 @@ $as_echo "$as_me: Potential Boot JDK fou
46 BOOT_JDK_FOUND=no 46 BOOT_JDK_FOUND=no
47 else 47 else
48 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 48 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
49- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 49- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
50+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 50+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
51  51
52 # Extra M4 quote needed to protect [] in grep expression. 52 # Extra M4 quote needed to protect [] in grep expression.
53 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 53 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
54@@ -20832,7 +20829,7 @@ $as_echo "$as_me: Potential Boot JDK fou 54@@ -20844,7 +20841,7 @@ $as_echo "$as_me: Potential Boot JDK fou
55 BOOT_JDK_FOUND=no 55 BOOT_JDK_FOUND=no
56 else 56 else
57 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 57 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
58- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 58- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
59+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 59+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
60  60
61 # Extra M4 quote needed to protect [] in grep expression. 61 # Extra M4 quote needed to protect [] in grep expression.
62 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 62 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
63@@ -21110,7 +21107,7 @@ fi 63@@ -21122,7 +21119,7 @@ fi
64 # Resolve file symlinks 64 # Resolve file symlinks
65 while test $COUNTER -lt 20; do 65 while test $COUNTER -lt 20; do
66 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 66 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
67- if test "x$ISLINK" == x; then 67- if test "x$ISLINK" == x; then
68+ if test "x$ISLINK" = x; then 68+ if test "x$ISLINK" = x; then
69 # This is not a symbolic link! We are done! 69 # This is not a symbolic link! We are done!
70 break 70 break
71 fi 71 fi
72@@ -21160,7 +21157,7 @@ $as_echo "$as_me: Potential Boot JDK fou 72@@ -21172,7 +21169,7 @@ $as_echo "$as_me: Potential Boot JDK fou
73 BOOT_JDK_FOUND=no 73 BOOT_JDK_FOUND=no
74 else 74 else
75 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 75 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
76- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 76- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
77+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 77+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
78  78
79 # Extra M4 quote needed to protect [] in grep expression. 79 # Extra M4 quote needed to protect [] in grep expression.
80 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 80 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
81@@ -21375,7 +21372,7 @@ $as_echo "$as_me: Potential Boot JDK fou 81@@ -21387,7 +21384,7 @@ $as_echo "$as_me: Potential Boot JDK fou
82 BOOT_JDK_FOUND=no 82 BOOT_JDK_FOUND=no
83 else 83 else
84 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 84 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
85- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 85- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
86+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 86+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
87  87
88 # Extra M4 quote needed to protect [] in grep expression. 88 # Extra M4 quote needed to protect [] in grep expression.
89 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 89 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
90@@ -21555,7 +21552,7 @@ $as_echo "$as_me: Potential Boot JDK fou 90@@ -21567,7 +21564,7 @@ $as_echo "$as_me: Potential Boot JDK fou
91 BOOT_JDK_FOUND=no 91 BOOT_JDK_FOUND=no
92 else 92 else
93 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 93 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
94- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 94- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
95+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 95+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
96  96
97 # Extra M4 quote needed to protect [] in grep expression. 97 # Extra M4 quote needed to protect [] in grep expression.
98 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 98 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
99@@ -21763,7 +21760,7 @@ $as_echo "$as_me: Potential Boot JDK fou 99@@ -21775,7 +21772,7 @@ $as_echo "$as_me: Potential Boot JDK fou
100 BOOT_JDK_FOUND=no 100 BOOT_JDK_FOUND=no
101 else 101 else
102 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 102 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
103- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 103- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
104+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 104+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
105  105
106 # Extra M4 quote needed to protect [] in grep expression. 106 # Extra M4 quote needed to protect [] in grep expression.
107 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 107 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
108@@ -21943,7 +21940,7 @@ $as_echo "$as_me: Potential Boot JDK fou 108@@ -21955,7 +21952,7 @@ $as_echo "$as_me: Potential Boot JDK fou
109 BOOT_JDK_FOUND=no 109 BOOT_JDK_FOUND=no
110 else 110 else
111 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 111 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
112- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 112- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
113+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 113+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
114  114
115 # Extra M4 quote needed to protect [] in grep expression. 115 # Extra M4 quote needed to protect [] in grep expression.
116 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 116 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
117@@ -22151,7 +22148,7 @@ $as_echo "$as_me: Potential Boot JDK fou 117@@ -22163,7 +22160,7 @@ $as_echo "$as_me: Potential Boot JDK fou
118 BOOT_JDK_FOUND=no 118 BOOT_JDK_FOUND=no
119 else 119 else
120 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 120 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
121- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 121- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
122+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 122+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
123  123
124 # Extra M4 quote needed to protect [] in grep expression. 124 # Extra M4 quote needed to protect [] in grep expression.
125 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 125 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
126@@ -22331,7 +22328,7 @@ $as_echo "$as_me: Potential Boot JDK fou 126@@ -22343,7 +22340,7 @@ $as_echo "$as_me: Potential Boot JDK fou
127 BOOT_JDK_FOUND=no 127 BOOT_JDK_FOUND=no
128 else 128 else
129 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 129 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
130- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 130- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
131+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 131+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
132  132
133 # Extra M4 quote needed to protect [] in grep expression. 133 # Extra M4 quote needed to protect [] in grep expression.
134 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 134 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
135@@ -22539,7 +22536,7 @@ $as_echo "$as_me: Potential Boot JDK fou 135@@ -22551,7 +22548,7 @@ $as_echo "$as_me: Potential Boot JDK fou
136 BOOT_JDK_FOUND=no 136 BOOT_JDK_FOUND=no
137 else 137 else
138 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 138 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
139- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 139- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
140+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 140+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
141  141
142 # Extra M4 quote needed to protect [] in grep expression. 142 # Extra M4 quote needed to protect [] in grep expression.
143 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 143 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
144@@ -22719,7 +22716,7 @@ $as_echo "$as_me: Potential Boot JDK fou 144@@ -22731,7 +22728,7 @@ $as_echo "$as_me: Potential Boot JDK fou
145 BOOT_JDK_FOUND=no 145 BOOT_JDK_FOUND=no
146 else 146 else
147 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 147 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
148- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 148- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
149+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 149+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
150  150
151 # Extra M4 quote needed to protect [] in grep expression. 151 # Extra M4 quote needed to protect [] in grep expression.
152 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 152 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
153@@ -22914,7 +22911,7 @@ $as_echo "$as_me: Potential Boot JDK fou 153@@ -22926,7 +22923,7 @@ $as_echo "$as_me: Potential Boot JDK fou
154 BOOT_JDK_FOUND=no 154 BOOT_JDK_FOUND=no
155 else 155 else
156 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 156 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
157- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 157- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
158+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 158+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
159  159
160 # Extra M4 quote needed to protect [] in grep expression. 160 # Extra M4 quote needed to protect [] in grep expression.
161 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 161 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
162@@ -23092,7 +23089,7 @@ $as_echo "$as_me: Potential Boot JDK fou 162@@ -23104,7 +23101,7 @@ $as_echo "$as_me: Potential Boot JDK fou
163 BOOT_JDK_FOUND=no 163 BOOT_JDK_FOUND=no
164 else 164 else
165 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 165 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
166- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 166- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
167+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 167+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
168  168
169 # Extra M4 quote needed to protect [] in grep expression. 169 # Extra M4 quote needed to protect [] in grep expression.
170 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 170 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
171@@ -23288,7 +23285,7 @@ $as_echo "$as_me: Potential Boot JDK fou 171@@ -23300,7 +23297,7 @@ $as_echo "$as_me: Potential Boot JDK fou
172 BOOT_JDK_FOUND=no 172 BOOT_JDK_FOUND=no
173 else 173 else
174 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 174 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
175- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 175- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
176+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 176+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
177  177
178 # Extra M4 quote needed to protect [] in grep expression. 178 # Extra M4 quote needed to protect [] in grep expression.
179 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 179 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
180@@ -23466,7 +23463,7 @@ $as_echo "$as_me: Potential Boot JDK fou 180@@ -23478,7 +23475,7 @@ $as_echo "$as_me: Potential Boot JDK fou
181 BOOT_JDK_FOUND=no 181 BOOT_JDK_FOUND=no
182 else 182 else
183 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 183 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
184- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 184- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
185+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 185+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
186  186
187 # Extra M4 quote needed to protect [] in grep expression. 187 # Extra M4 quote needed to protect [] in grep expression.
188 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 188 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
189@@ -23661,7 +23658,7 @@ $as_echo "$as_me: Potential Boot JDK fou 189@@ -23673,7 +23670,7 @@ $as_echo "$as_me: Potential Boot JDK fou
190 BOOT_JDK_FOUND=no 190 BOOT_JDK_FOUND=no
191 else 191 else
192 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 192 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
193- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 193- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
194+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 194+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
195  195
196 # Extra M4 quote needed to protect [] in grep expression. 196 # Extra M4 quote needed to protect [] in grep expression.
197 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 197 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
198@@ -23839,7 +23836,7 @@ $as_echo "$as_me: Potential Boot JDK fou 198@@ -23851,7 +23848,7 @@ $as_echo "$as_me: Potential Boot JDK fou
199 BOOT_JDK_FOUND=no 199 BOOT_JDK_FOUND=no
200 else 200 else
201 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 201 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
202- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 202- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
203+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 203+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
204  204
205 # Extra M4 quote needed to protect [] in grep expression. 205 # Extra M4 quote needed to protect [] in grep expression.
206 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 206 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
207@@ -24035,7 +24032,7 @@ $as_echo "$as_me: Potential Boot JDK fou 207@@ -24047,7 +24044,7 @@ $as_echo "$as_me: Potential Boot JDK fou
208 BOOT_JDK_FOUND=no 208 BOOT_JDK_FOUND=no
209 else 209 else
210 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 210 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
211- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 211- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
212+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 212+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
213  213
214 # Extra M4 quote needed to protect [] in grep expression. 214 # Extra M4 quote needed to protect [] in grep expression.
215 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 215 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
216@@ -24213,7 +24210,7 @@ $as_echo "$as_me: Potential Boot JDK fou 216@@ -24225,7 +24222,7 @@ $as_echo "$as_me: Potential Boot JDK fou
217 BOOT_JDK_FOUND=no 217 BOOT_JDK_FOUND=no
218 else 218 else
219 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 219 # 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` 220- 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` 221+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
222  222
223 # Extra M4 quote needed to protect [] in grep expression. 223 # Extra M4 quote needed to protect [] in grep expression.
224 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 224 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
225@@ -24390,7 +24387,7 @@ $as_echo "$as_me: Potential Boot JDK fou 225@@ -24402,7 +24399,7 @@ $as_echo "$as_me: Potential Boot JDK fou
226 BOOT_JDK_FOUND=no 226 BOOT_JDK_FOUND=no
227 else 227 else
228 # 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?
229- 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`
230+ 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`
231  231
232 # Extra M4 quote needed to protect [] in grep expression. 232 # Extra M4 quote needed to protect [] in grep expression.
233 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 233 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
234@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk 234@@ -24808,16 +24805,15 @@ $as_echo_n "checking flags for boot jdk
235 # Maximum amount of heap memory. 235 # Maximum amount of heap memory.
236 # Maximum stack size. 236 # Maximum stack size.
237 if test "x$BOOT_JDK_BITS" = x32; then 237 if test "x$BOOT_JDK_BITS" = x32; then
238- JVM_MAX_HEAP=768M 238- JVM_MAX_HEAP=768M
239 STACK_SIZE=768 239 STACK_SIZE=768
240 else 240 else
241 # 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
242 # 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
243 # 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
244 # jdk batch 244 # jdk batch
245- JVM_MAX_HEAP=1600M 245- JVM_MAX_HEAP=1600M
246 STACK_SIZE=1536 246 STACK_SIZE=1536
247 fi 247 fi
248+ JVM_MAX_HEAP=800M 248+ JVM_MAX_HEAP=800M
249  249
250 $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 250 $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
251 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 251 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
252@@ -27334,7 +27330,7 @@ $as_echo_n "checking resolved symbolic l 252@@ -27351,7 +27347,7 @@ $as_echo_n "checking resolved symbolic l
253 # Resolve file symlinks 253 # Resolve file symlinks
254 while test $COUNTER -lt 20; do 254 while test $COUNTER -lt 20; do
255 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 255 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
256- if test "x$ISLINK" == x; then 256- if test "x$ISLINK" == x; then
257+ if test "x$ISLINK" = x; then 257+ if test "x$ISLINK" = x; then
258 # This is not a symbolic link! We are done! 258 # This is not a symbolic link! We are done!
259 break 259 break
260 fi 260 fi
261@@ -27789,7 +27785,7 @@ $as_echo_n "checking for resolved symbol 261@@ -27806,7 +27802,7 @@ $as_echo_n "checking for resolved symbol
262 # Resolve file symlinks 262 # Resolve file symlinks
263 while test $COUNTER -lt 20; do 263 while test $COUNTER -lt 20; do
264 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 264 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
265- if test "x$ISLINK" == x; then 265- if test "x$ISLINK" == x; then
266+ if test "x$ISLINK" = x; then 266+ if test "x$ISLINK" = x; then
267 # This is not a symbolic link! We are done! 267 # This is not a symbolic link! We are done!
268 break 268 break
269 fi 269 fi
270@@ -29075,7 +29071,7 @@ $as_echo_n "checking resolved symbolic l 270@@ -29092,7 +29088,7 @@ $as_echo_n "checking resolved symbolic l
271 # Resolve file symlinks 271 # Resolve file symlinks
272 while test $COUNTER -lt 20; do 272 while test $COUNTER -lt 20; do
273 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 273 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
274- if test "x$ISLINK" == x; then 274- if test "x$ISLINK" == x; then
275+ if test "x$ISLINK" = x; then 275+ if test "x$ISLINK" = x; then
276 # This is not a symbolic link! We are done! 276 # This is not a symbolic link! We are done!
277 break 277 break
278 fi 278 fi
279@@ -29530,7 +29526,7 @@ $as_echo_n "checking for resolved symbol 279@@ -29547,7 +29543,7 @@ $as_echo_n "checking for resolved symbol
280 # Resolve file symlinks 280 # Resolve file symlinks
281 while test $COUNTER -lt 20; do 281 while test $COUNTER -lt 20; do
282 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/'`
283- if test "x$ISLINK" == x; then 283- if test "x$ISLINK" == x; then
284+ if test "x$ISLINK" = x; then 284+ if test "x$ISLINK" = x; then
285 # This is not a symbolic link! We are done! 285 # This is not a symbolic link! We are done!
286 break 286 break
287 fi 287 fi
288@@ -41214,6 +41210,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 288@@ -41263,6 +41259,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
289 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 289 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
290 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' 290 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
291 SET_SHARED_LIBRARY_MAPFILE='' 291 SET_SHARED_LIBRARY_MAPFILE=''
292+ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then 292+ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
293+ SHARED_LIBRARY_FLAGS="-shared" 293+ SHARED_LIBRARY_FLAGS="-shared"
294+ SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1' 294+ SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1'
295+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 295+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
296+ SET_SHARED_LIBRARY_NAME='' 296+ SET_SHARED_LIBRARY_NAME=''
297+ SET_SHARED_LIBRARY_MAPFILE='' 297+ SET_SHARED_LIBRARY_MAPFILE=''
298 else 298 else
299 # Default works for linux, might work on other platforms as well. 299 # Default works for linux, might work on other platforms as well.
300 SHARED_LIBRARY_FLAGS='-shared' 300 SHARED_LIBRARY_FLAGS='-shared'
301@@ -41262,7 +41264,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 301@@ -41311,7 +41313,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
302 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 302 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
303 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" 303 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
304 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" 304 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
305+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then 305+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
306 CFLAGS_JDKLIB_EXTRA='-xstrconst' 306 CFLAGS_JDKLIB_EXTRA='-xstrconst'
307+ fi 307+ fi
308 fi 308 fi
309 # The (cross) compiler is now configured, we can now test capabilities 309 # The (cross) compiler is now configured, we can now test capabilities
310 # of the target platform. 310 # of the target platform.
311@@ -42453,7 +42457,8 @@ $as_echo "alsa pulse x11" >&6; } 311@@ -41460,7 +41464,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
 312 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
 313 ;;
 314 esac
 315- if test "x$OPENJDK_TARGET_OS" != xmacosx; then
 316+ if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then
 317 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
 318 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
 319 fi
 320@@ -42536,7 +42540,8 @@ $as_echo "alsa pulse x11" >&6; }
312 if test "x$OPENJDK_TARGET_OS" = xbsd; then 321 if test "x$OPENJDK_TARGET_OS" = xbsd; then
313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
314 $as_echo_n "checking what is not needed on BSD?... " >&6; } 323 $as_echo_n "checking what is not needed on BSD?... " >&6; }
315- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then 324- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; 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 325+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then
317+# XXX revisit this 326+# XXX revisit this
318 ALSA_NOT_NEEDED=yes 327 ALSA_NOT_NEEDED=yes
319 PULSE_NOT_NEEDED=yes 328 PULSE_NOT_NEEDED=yes
320 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 329 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
321@@ -43683,7 +43688,7 @@ $as_echo "$as_me: WARNING: Can't find pr 330@@ -43766,7 +43771,7 @@ $as_echo "$as_me: WARNING: Can't find pr
322 BUILD_FREETYPE=no 331 BUILD_FREETYPE=no
323 fi 332 fi
324 # Now check if configure found a version of 'msbuild.exe' 333 # Now check if configure found a version of 'msbuild.exe'
325- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then 334- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then
326+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then 335+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then
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 336 { $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
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;} 337 $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;}
329 BUILD_FREETYPE=no 338 BUILD_FREETYPE=no
330@@ -44099,7 +44104,11 @@ $as_echo "$as_me: WARNING: --with-freety 339@@ -44182,7 +44187,11 @@ $as_echo "$as_me: WARNING: --with-freety
331  340
332 # Allow --with-freetype-lib and --with-freetype-include to override 341 # Allow --with-freetype-lib and --with-freetype-include to override
333 if test "x$with_freetype_include" != x; then 342 if test "x$with_freetype_include" != x; then
334- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 343- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
335+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 344+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
336+ # deal w/ freetype2 in new location 345+ # deal w/ freetype2 in new location
337+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then 346+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then
338+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2 347+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2
339+ fi 348+ fi
340 fi 349 fi
341 if test "x$with_freetype_lib" != x; then 350 if test "x$with_freetype_lib" != x; then
342 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" 351 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
343@@ -47209,7 +47218,7 @@ $as_echo "$as_me: The path of FREETYPE_I 352@@ -47292,7 +47301,7 @@ $as_echo "$as_me: The path of FREETYPE_I
344 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 353 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
345 fi 354 fi
346  355
347- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then 356- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
348+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then 357+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then
349 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" 358 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
350 else 359 else
351 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" 360 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
352@@ -47342,7 +47351,7 @@ $as_echo "$as_me: The path of FREETYPE_L 361@@ -47425,7 +47434,7 @@ $as_echo "$as_me: The path of FREETYPE_L
353 if test "x$OPENJDK_TARGET_OS" = xwindows; then 362 if test "x$OPENJDK_TARGET_OS" = xwindows; then
354 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" 363 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
355 else 364 else
356- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype" 365- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
357+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype" 366+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype"
358 fi 367 fi
359 fi 368 fi
360  369
361@@ -48571,9 +48580,6 @@ fi 370@@ -48654,9 +48663,6 @@ fi
362  371
363  372
364  373
365- if test "x$LLVM_CONFIG" != xllvm-config; then 374- if test "x$LLVM_CONFIG" != xllvm-config; then
366- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5 375- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
367- fi 376- fi
368  377
369 llvm_components="jit mcjit engine nativecodegen native" 378 llvm_components="jit mcjit engine nativecodegen native"
370 unset LLVM_CFLAGS 379 unset LLVM_CFLAGS
371@@ -48616,7 +48622,7 @@ fi 380@@ -48699,7 +48705,7 @@ fi
372 fi 381 fi
373  382
374 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) 383 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
375- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then 384- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
376+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then 385+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then
377 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" 386 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
378 fi 387 fi
379  388