| 1 |
commit: 9465512df55b6c865841953f2d8b5c64550fb7ba |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 03:51:32 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 03:51:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9465512d |
| 7 |
|
| 8 |
dev-java/openjdk: add gcc10 patch to openjdk-8 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/721970 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
.../openjdk/files/openjdk-8-detect-gcc10.patch | 49 ++++++++++++++++++++++ |
| 15 |
dev-java/openjdk/openjdk-8.252_p09.ebuild | 5 +++ |
| 16 |
2 files changed, 54 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..b47e012d4a3 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch |
| 23 |
@@ -0,0 +1,49 @@ |
| 24 |
+From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
| 26 |
+Date: Sat, 23 May 2020 20:48:10 -0700 |
| 27 |
+Subject: [PATCH] backport gcc10 fix |
| 28 |
+ |
| 29 |
+https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0 |
| 30 |
+--- |
| 31 |
+ common/autoconf/generated-configure.sh | 4 ++-- |
| 32 |
+ common/autoconf/toolchain.m4 | 2 +- |
| 33 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh |
| 36 |
+index 5e71c50..90c017d 100644 |
| 37 |
+--- a/common/autoconf/generated-configure.sh |
| 38 |
++++ b/common/autoconf/generated-configure.sh |
| 39 |
+@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO |
| 40 |
+ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 41 |
+ $SED -e 's/ *Copyright .*//'` |
| 42 |
+ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 43 |
+- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` |
| 44 |
++ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` |
| 45 |
+ elif test "x$TOOLCHAIN_TYPE" = xclang; then |
| 46 |
+ # clang --version output typically looks like |
| 47 |
+ # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
| 48 |
+@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO |
| 49 |
+ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 50 |
+ $SED -e 's/ *Copyright .*//'` |
| 51 |
+ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 52 |
+- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` |
| 53 |
++ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` |
| 54 |
+ elif test "x$TOOLCHAIN_TYPE" = xclang; then |
| 55 |
+ # clang --version output typically looks like |
| 56 |
+ # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
| 57 |
+diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 |
| 58 |
+index e3a82c8..c0a4af5 100644 |
| 59 |
+--- a/common/autoconf/toolchain.m4 |
| 60 |
++++ b/common/autoconf/toolchain.m4 |
| 61 |
+@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], |
| 62 |
+ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 63 |
+ $SED -e 's/ *Copyright .*//'` |
| 64 |
+ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
| 65 |
+- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` |
| 66 |
++ $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` |
| 67 |
+ elif test "x$TOOLCHAIN_TYPE" = xclang; then |
| 68 |
+ # clang --version output typically looks like |
| 69 |
+ # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
| 70 |
+-- |
| 71 |
+2.26.2 |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 75 |
index 1b3576eacaf..45c3e3cc90c 100644 |
| 76 |
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 77 |
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 78 |
@@ -80,6 +80,11 @@ PDEPEND=" |
| 79 |
|
| 80 |
S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" |
| 81 |
|
| 82 |
+# bug 721970, JDK-8244760 |
| 83 |
+PATCHES=( |
| 84 |
+ "${FILESDIR}/openjdk-8-detect-gcc10.patch" |
| 85 |
+) |
| 86 |
+ |
| 87 |
# The space required to build varies wildly depending on USE flags, |
| 88 |
# ranging from 2GB to 16GB. This function is certainly not exact but |
| 89 |
# should be close enough to be useful. |
Archives