diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-05-24 04:05:20 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-05-24 04:05:20 +0000 |
| commit | b64297f9fdeb5c141805dd69d40664399c1b2762 (patch) | |
| tree | a992cd19574ca6045f50a8095e112cda61b1ce28 | |
| parent | 2020-05-24 03:35:37 UTC (diff) | |
| parent | dev-java/openjdk: add gcc10 patch to openjdk-8 (diff) | |
| download | gentoo-b64297f9fdeb5c141805dd69d40664399c1b2762.tar.gz gentoo-b64297f9fdeb5c141805dd69d40664399c1b2762.tar.bz2 gentoo-b64297f9fdeb5c141805dd69d40664399c1b2762.zip | |
Merge updates from master
| -rw-r--r-- | dev-java/openjdk/files/openjdk-8-detect-gcc10.patch | 49 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-8.252_p09.ebuild | 5 | ||||
| -rw-r--r-- | eclass/meson.eclass | 6 |
3 files changed, 54 insertions, 6 deletions
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch new file mode 100644 index 000000000000..b47e012d4a39 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch @@ -0,0 +1,49 @@ +From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 23 May 2020 20:48:10 -0700 +Subject: [PATCH] backport gcc10 fix + +https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0 +--- + common/autoconf/generated-configure.sh | 4 ++-- + common/autoconf/toolchain.m4 | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index 5e71c50..90c017d 100644 +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO + 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) +@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO + 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) +diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 +index e3a82c8..c0a4af5 100644 +--- a/common/autoconf/toolchain.m4 ++++ b/common/autoconf/toolchain.m4 +@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], + 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) +-- +2.26.2 + diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild index 1b3576eacaf4..45c3e3cc90ca 100644 --- a/dev-java/openjdk/openjdk-8.252_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild @@ -80,6 +80,11 @@ PDEPEND=" S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" +# bug 721970, JDK-8244760 +PATCHES=( + "${FILESDIR}/openjdk-8-detect-gcc10.patch" +) + # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful. diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 617e5cb23e51..e79faa1beea3 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -253,12 +253,6 @@ _meson_create_native_file() { cpu_family = '${cpu_family}' cpu = '${cpu}' endian = '$(tc-endian "${CBUILD}")' - - [host_machine] - system = '${system}' - cpu_family = '${cpu_family}' - cpu = '${cpu}' - endian = '$(tc-endian "${CBUILD}")' EOF echo "${fn}" |