cross/gcc-*: rebuild with changes from Alpine

ERROR: unable to select packages:
  libstdc++-10.3.1_git20210424-r1:
    breaks: g++-aarch64-10.3.1_git20210424-r0[libstdc++=10.3.1_git20210424-r0]
    satisfies: g++-10.3.1_git20210424-r1[libstdc++=10.3.1_git20210424-r1]
               g++-10.3.1_git20210424-r1[libstdc++=10.3.1_git20210424-r1]
               gcc-10.3.1_git20210424-r1[so:libstdc++.so.6]
               libgmpxx-6.2.1-r0[so:libstdc++.so.6]
               binutils-aarch64-2.35.2-r2[so:libstdc++.so.6]
               binutils-2.35.2-r2[so:libstdc++.so.6]
               ccache-4.3-r0[so:libstdc++.so.6]
               lzip-1.22-r0[so:libstdc++.so.6]
  gcc-10.3.1_git20210424-r1:
    breaks: g++-aarch64-10.3.1_git20210424-r0[gcc=10.3.1_git20210424-r0]
    satisfies: g++-10.3.1_git20210424-r1[gcc=10.3.1_git20210424-r1]
               build-base-0.5-r2[gcc]
This commit is contained in:
Minecrell 2021-06-11 21:05:24 +02:00
parent ee581e5f16
commit 0b77700f79
No known key found for this signature in database
GPG key ID: B77CE638A6C2E562
3 changed files with 33 additions and 6 deletions

View file

@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname=gcc-aarch64 pkgname=gcc-aarch64
pkgrel=0 pkgrel=1
pkgdesc="Stage2 cross-compiler for aarch64" pkgdesc="Stage2 cross-compiler for aarch64"
url="https://gcc.gnu.org" url="https://gcc.gnu.org"
arch="x86_64" arch="x86_64"
@ -116,12 +116,16 @@ fi
# GDC hasn't been ported to PowerPC # GDC hasn't been ported to PowerPC
# See libphobos/configure.tgt in GCC sources for supported targets # See libphobos/configure.tgt in GCC sources for supported targets
[ "$CARCH" = ppc64le ] && LANG_D=false # riscv fails with: error: static assert "unimplemented"
case "$CARCH" in
ppc64le|riscv64) LANG_D=false ;;
esac
# libitm has TEXTRELs in ARM build, so disable for now # libitm has TEXTRELs in ARM build, so disable for now
case "$CTARGET_ARCH" in case "$CTARGET_ARCH" in
arm*) _libitm=false ;; arm*) _libitm=false ;;
mips*) _libitm=false ;; mips*) _libitm=false ;;
riscv64) _libitm=false ;;
esac esac
# Internal libffi fails to build on MIPS at the moment, need to # Internal libffi fails to build on MIPS at the moment, need to
@ -148,6 +152,11 @@ if $_libgomp; then
subpackages="$subpackages libgomp::$CTARGET_ARCH" subpackages="$subpackages libgomp::$CTARGET_ARCH"
fi fi
case "$CARCH" in
riscv64)
LANG_ADA=false;;
esac
_languages=c _languages=c
if $LANG_CXX; then if $LANG_CXX; then
_languages="$_languages,c++" _languages="$_languages,c++"

View file

@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname=gcc-armhf pkgname=gcc-armhf
pkgrel=0 pkgrel=1
pkgdesc="Stage2 cross-compiler for armhf" pkgdesc="Stage2 cross-compiler for armhf"
url="https://gcc.gnu.org" url="https://gcc.gnu.org"
arch="x86_64" arch="x86_64"
@ -116,12 +116,16 @@ fi
# GDC hasn't been ported to PowerPC # GDC hasn't been ported to PowerPC
# See libphobos/configure.tgt in GCC sources for supported targets # See libphobos/configure.tgt in GCC sources for supported targets
[ "$CARCH" = ppc64le ] && LANG_D=false # riscv fails with: error: static assert "unimplemented"
case "$CARCH" in
ppc64le|riscv64) LANG_D=false ;;
esac
# libitm has TEXTRELs in ARM build, so disable for now # libitm has TEXTRELs in ARM build, so disable for now
case "$CTARGET_ARCH" in case "$CTARGET_ARCH" in
arm*) _libitm=false ;; arm*) _libitm=false ;;
mips*) _libitm=false ;; mips*) _libitm=false ;;
riscv64) _libitm=false ;;
esac esac
# Internal libffi fails to build on MIPS at the moment, need to # Internal libffi fails to build on MIPS at the moment, need to
@ -148,6 +152,11 @@ if $_libgomp; then
subpackages="$subpackages libgomp::$CTARGET_ARCH" subpackages="$subpackages libgomp::$CTARGET_ARCH"
fi fi
case "$CARCH" in
riscv64)
LANG_ADA=false;;
esac
_languages=c _languages=c
if $LANG_CXX; then if $LANG_CXX; then
_languages="$_languages,c++" _languages="$_languages,c++"

View file

@ -31,7 +31,7 @@ pkgver=10.3.1_git20210424
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname=gcc-armv7 pkgname=gcc-armv7
pkgrel=0 pkgrel=1
pkgdesc="Stage2 cross-compiler for armv7" pkgdesc="Stage2 cross-compiler for armv7"
url="https://gcc.gnu.org" url="https://gcc.gnu.org"
arch="x86_64" arch="x86_64"
@ -116,12 +116,16 @@ fi
# GDC hasn't been ported to PowerPC # GDC hasn't been ported to PowerPC
# See libphobos/configure.tgt in GCC sources for supported targets # See libphobos/configure.tgt in GCC sources for supported targets
[ "$CARCH" = ppc64le ] && LANG_D=false # riscv fails with: error: static assert "unimplemented"
case "$CARCH" in
ppc64le|riscv64) LANG_D=false ;;
esac
# libitm has TEXTRELs in ARM build, so disable for now # libitm has TEXTRELs in ARM build, so disable for now
case "$CTARGET_ARCH" in case "$CTARGET_ARCH" in
arm*) _libitm=false ;; arm*) _libitm=false ;;
mips*) _libitm=false ;; mips*) _libitm=false ;;
riscv64) _libitm=false ;;
esac esac
# Internal libffi fails to build on MIPS at the moment, need to # Internal libffi fails to build on MIPS at the moment, need to
@ -148,6 +152,11 @@ if $_libgomp; then
subpackages="$subpackages libgomp::$CTARGET_ARCH" subpackages="$subpackages libgomp::$CTARGET_ARCH"
fi fi
case "$CARCH" in
riscv64)
LANG_ADA=false;;
esac
_languages=c _languages=c
if $LANG_CXX; then if $LANG_CXX; then
_languages="$_languages,c++" _languages="$_languages,c++"