From e59a0ad98f48caf0f684e7d6ae0d2bfa4a6ba60d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 5 Jan 2025 19:14:38 +0100 Subject: [PATCH] cross/gcc-*: upgrade to 14.2.0-r5 (MR 5986) Done with pmbootstrap MR 2521. --- cross/gcc-aarch64/APKBUILD | 17 ++++++++--------- cross/gcc-armhf/APKBUILD | 17 ++++++++--------- cross/gcc-armv7/APKBUILD | 17 ++++++++--------- cross/gcc-riscv64/APKBUILD | 17 ++++++++--------- cross/gcc-x86/APKBUILD | 17 ++++++++--------- cross/gcc-x86_64/APKBUILD | 19 ++++++++----------- 6 files changed, 48 insertions(+), 56 deletions(-) diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index 471e3cadb..3b4e8dcc1 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-aarch64 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for aarch64" url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-aarch64 mpc1" +depends="binutils-aarch64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64" subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -320,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -473,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -486,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -570,9 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ } diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index e4e849b4a..42c47a3f9 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armhf -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for armhf" url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-armhf mpc1" +depends="binutils-armhf mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -320,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -473,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -486,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -570,9 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ } diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 7ef4e5509..e0272c032 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armv7 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for armv7" url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-armv7 mpc1" +depends="binutils-armv7 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7" subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -320,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -473,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -486,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -570,9 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ } diff --git a/cross/gcc-riscv64/APKBUILD b/cross/gcc-riscv64/APKBUILD index 4767e2e13..b30ae58b6 100644 --- a/cross/gcc-riscv64/APKBUILD +++ b/cross/gcc-riscv64/APKBUILD @@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-riscv64 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for riscv64" url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-riscv64 mpc1" +depends="binutils-riscv64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64" subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -320,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -473,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -486,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -570,9 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ } diff --git a/cross/gcc-x86/APKBUILD b/cross/gcc-x86/APKBUILD index e53e84d04..118bf937f 100644 --- a/cross/gcc-x86/APKBUILD +++ b/cross/gcc-x86/APKBUILD @@ -34,20 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-x86 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for x86" url="https://gcc.gnu.org" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-x86 mpc1" +depends="binutils-x86 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86 binutils-x86" subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -320,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -473,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -486,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -570,9 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ } diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD index f7e2ca428..ebc60620a 100644 --- a/cross/gcc-x86_64/APKBUILD +++ b/cross/gcc-x86_64/APKBUILD @@ -34,21 +34,19 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-x86_64 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for x86_64" url="https://gcc.gnu.org" arch="aarch64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel -depends="binutils-x86_64 mpc1" +depends="binutils-x86_64 mpc1 so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86_64 binutils-x86_64" subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" options="!strip !tracedeps" -depends="$depends so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1" - : "${LANG_CXX:=true}" : "${LANG_D:=true}" @@ -321,7 +319,7 @@ build() { i586-*-*-*) _arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";; s390x-*-*-*) _arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";; riscv64-*-*-*) _arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";; - loongarch64-*-*-*) _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";; + loongarch64-*-*-*) _arch_configure="--with-arch=la64v1.0 --with-abi=lp64d";; esac case "$CTARGET_ARCH" in @@ -474,7 +472,9 @@ package() { # move ada runtime libs if $LANG_ADA; then - for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do + local libgnat_static= + [ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a" + for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do mv "$i" "$pkgdir"/usr/lib/ ln -s ../../../../${i##*/} $i done @@ -487,9 +487,6 @@ package() { # libcc1 does not depend on target, don't ship it rm -rf "$pkgdir"/usr/lib/libcc1.so* - # These are moved into packages with arch=$CTARGET_ARCH so remove - # cross prefix - #mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot @@ -571,10 +568,10 @@ libcxx_dev() { gpp() { pkgdesc="GNU C++ standard library and compiler" depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev" - depends="$depends so:libc.musl-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" - [ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel" + depends="$depends so:libc.musl-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1" + amove $_gcclibexec/cc1plus amove usr/bin/*++ }