diff options
author | tnn <tnn@pkgsrc.org> | 2021-04-28 17:32:12 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2021-04-28 17:32:12 +0000 |
commit | d650e5aa4f2268446637e5004fb7097fa934d7d0 (patch) | |
tree | 6966feb2ef2a87b8693cfb8235adaf40ddd4b6aa /lang/openjdk8 | |
parent | 2e2b4d8b360ac3554f1a8f9b66368b02293ba945 (diff) | |
download | pkgsrc-d650e5aa4f2268446637e5004fb7097fa934d7d0.tar.gz |
openjdk8: fix build w/ GCC>=10
Diffstat (limited to 'lang/openjdk8')
-rw-r--r-- | lang/openjdk8/distinfo | 4 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh | 23 |
2 files changed, 23 insertions, 4 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index c8e239a625c..4589a4d8efb 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.80 2020/05/15 10:15:48 jperkin Exp $ +$NetBSD: distinfo,v 1.81 2021/04/28 17:32:12 tnn Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -47,7 +47,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462 -SHA1 (patch-common_autoconf_generated-configure.sh) = eab6b88c6103df2267822b3538f37eebf480c7d4 +SHA1 (patch-common_autoconf_generated-configure.sh) = f9c391681451b3c3714d498a8c9110bd9f1f26d2 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh index f298bb353ea..696e8e1a9f8 100644 --- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh +++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh @@ -1,7 +1,8 @@ -$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.19 2020/05/15 10:15:49 jperkin Exp $ +$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.20 2021/04/28 17:32:12 tnn Exp $ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and pkg/53223. +Fix detection of GCC>=10. --- common/autoconf/generated-configure.sh.orig 2020-04-15 02:42:06.000000000 +0000 +++ common/autoconf/generated-configure.sh @@ -231,7 +232,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24937,16 +24934,15 @@ $as_echo_n "checking flags for boot jdk +@@ -24937,16 +24934,15 @@ $as_echo_n "checking flags for boot jdk # Maximum amount of heap memory. # Maximum stack size. if test "x$BOOT_JDK_BITS" = x32; then @@ -267,6 +268,15 @@ pkg/53223. # This is not a symbolic link! We are done! break fi +@@ -28046,7 +28042,7 @@ $as_echo "$as_me: The result from runnin + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` ++ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) @@ -29221,7 +29217,7 @@ $as_echo_n "checking resolved symbolic l # Resolve file symlinks while test $COUNTER -lt 20; do @@ -285,6 +295,15 @@ pkg/53223. # This is not a symbolic link! We are done! break fi +@@ -29787,7 +29783,7 @@ $as_echo "$as_me: The result from runnin + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` ++ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) @@ -41393,6 +41389,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' |