snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

openjdk9-bootstap: needs -fcommon for gcc10 

Also add patch to detect compiler versions with major greater than 9.

[ci skip]
This commit is contained in:
Jürgen Buchmüller 2020-08-18 23:48:54 +02:00
parent b4fbf7c4e8
commit 18c2b8bf92
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
srcpkgs/openjdk9-bootstrap/patches/fix-compiler-version-10+.patch Normal file
View File

@ -0,0 +1,31 @@
--- a/common/autoconf/generated-configure.sh 2017-12-20 00:25:20.000000000 +0100
+++ b/common/autoconf/generated-configure.sh 2020-08-18 23:29:24.482332056 +0200
@@ -34082,7 +34082,7 @@
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *[Uu]sage:.*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/"`
+ $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9][0-9]*\.[0-9][0-9]*\).*/\1/"`
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
# xlc -qversion output typically looks like
# IBM XL C/C++ for AIX, V11.1 (5724-X13)
@@ -34143,7 +34143,7 @@
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.]*\)[^0-9.].*$/\1/'`
+ $SED -e 's/^.* \([1-9][0-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)
--- a/common/autoconf/toolchain.m4 2017-12-20 00:25:20.000000000 +0100
+++ b/common/autoconf/toolchain.m4 2020-08-18 23:32:12.832325343 +0200
@@ -424,7 +424,7 @@
# Collapse compiler output into a single line
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
+ $SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\).*$/\1/'`
else
AC_MSG_ERROR([Unknown toolchain type $TOOLCHAIN_TYPE.])
fi

2
srcpkgs/openjdk9-bootstrap/template
View File

@ -108,6 +108,8 @@ do_configure() {
CXXFLAGS+=" -DABI_ELFv2"
;;
esac
CFLAGS+=" -fcommon"
CXXFLAGS+=" -fcommon"
configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/}