diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
| commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
| tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-java/openjdk/files | |
| parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) | |
gentoo resync : 30.05.2020
Diffstat (limited to 'dev-java/openjdk/files')
| -rw-r--r-- | dev-java/openjdk/files/openjdk-11-make43.patch | 12 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-8-detect-gcc10.patch | 49 |
2 files changed, 49 insertions, 12 deletions
diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch deleted file mode 100644 index 9466e2be56fb..000000000000 --- a/dev-java/openjdk/files/openjdk-11-make43.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk -index 170c3ed..b3b49f1 100644 ---- a/make/common/MakeBase.gmk -+++ b/make/common/MakeBase.gmk -@@ -974,6 +974,7 @@ DependOnVariableFileName = \ - # Param 2 - (optional) name of file to store value in - DependOnVariableHelper = \ - $(strip \ -+ $(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE) true) \ - $(eval -include $(call DependOnVariableFileName, $1, $2)) \ - $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ - $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ 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 + |