forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

cross/gcc-{armv7,aarch64}: upgrade to 11.2.1_git20220219-r4

Browse source 
Fix the following error:

ERROR: unable to select packages:
  libstdc++-11.2.1_git20220219-r4:
    breaks: g++-aarch64-11.2.1_git20220219-r3[libstdc++=11.2.1_git20220219-r3]
    satisfies: gcc-11.2.1_git20220219-r4[so:libstdc++.so.6]
               binutils-2.38-r3[so:libstdc++.so.6]
               ccache-4.6.1-r0[so:libstdc++.so.6]
  gcc-11.2.1_git20220219-r4:
    breaks: g++-aarch64-11.2.1_git20220219-r3[gcc=11.2.1_git20220219-r3]

The new version does not seem to be in the armhf repos yet so skip that
one for now.
This commit is contained in:
Minecrell 2022-07-19 18:41:55 +02:00
parent ca8a14e0c8
commit 074a142319
No known key found for this signature in database
GPG key ID: B77CE638A6C2E562
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cross/gcc-aarch64/APKBUILD
View file

@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname=gcc-aarch64 pkgname=gcc-aarch64
pkgrel=3 pkgrel=4
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"
@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
_languages="$_languages,fortran" _languages="$_languages,fortran"
fi fi
if $LANG_ADA; then if $LANG_ADA; then
subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat" subpackages="$subpackages gcc-gnat$_target:gnat"
_languages="$_languages,ada" _languages="$_languages,ada"
[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap" if [ "$CBUILD" = "$CTARGET" ]; then
[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross" makedepends_build="$makedepends_build gcc-gnat-bootstrap"
subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
else
subpackages="$subpackages libgnat::$CTARGET_ARCH"
makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
fi
fi fi
if $LANG_JIT; then if $LANG_JIT; then
subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev" subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@ -435,11 +440,13 @@ package() {
mv "$i" "$pkgdir"/usr/lib/ mv "$i" "$pkgdir"/usr/lib/
ln -s ../../../../${i##*/} $i ln -s ../../../../${i##*/} $i
done done
if [ "$CHOST" = "$CTARGET" ]; then
for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
mv "$i" "$pkgdir"/usr/lib/ mv "$i" "$pkgdir"/usr/lib/
ln -s ../../../../${i##*/} $i ln -s ../../../../${i##*/} $i
done done
fi fi
fi
if [ "$CHOST" != "$CTARGET" ]; then if [ "$CHOST" != "$CTARGET" ]; then
# cross-gcc: remove any files that would conflict with the # cross-gcc: remove any files that would conflict with the

15
cross/gcc-armv7/APKBUILD
View file

@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname=gcc-armv7 pkgname=gcc-armv7
pkgrel=3 pkgrel=4
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"
@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
_languages="$_languages,fortran" _languages="$_languages,fortran"
fi fi
if $LANG_ADA; then if $LANG_ADA; then
subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat" subpackages="$subpackages gcc-gnat$_target:gnat"
_languages="$_languages,ada" _languages="$_languages,ada"
[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap" if [ "$CBUILD" = "$CTARGET" ]; then
[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross" makedepends_build="$makedepends_build gcc-gnat-bootstrap"
subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
else
subpackages="$subpackages libgnat::$CTARGET_ARCH"
makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
fi
fi fi
if $LANG_JIT; then if $LANG_JIT; then
subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev" subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@ -435,11 +440,13 @@ package() {
mv "$i" "$pkgdir"/usr/lib/ mv "$i" "$pkgdir"/usr/lib/
ln -s ../../../../${i##*/} $i ln -s ../../../../${i##*/} $i
done done
if [ "$CHOST" = "$CTARGET" ]; then
for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
mv "$i" "$pkgdir"/usr/lib/ mv "$i" "$pkgdir"/usr/lib/
ln -s ../../../../${i##*/} $i ln -s ../../../../${i##*/} $i
done done
fi fi
fi
if [ "$CHOST" != "$CTARGET" ]; then if [ "$CHOST" != "$CTARGET" ]; then
# cross-gcc: remove any files that would conflict with the # cross-gcc: remove any files that would conflict with the