From e2d1aa7bcfcf2611d1f21d3c17d7da5af9a4ddf9 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Sun, 25 Sep 2022 09:04:25 +0200 Subject: [PATCH] cross/gcc-*: upgrade to 12.1.1_git20220630-r6 (MR 3464) --- cross/gcc-aarch64/APKBUILD | 18 +++++++++--------- cross/gcc-armhf/APKBUILD | 18 +++++++++--------- cross/gcc-armv7/APKBUILD | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index e267f611c..0cfacf756 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -31,7 +31,7 @@ pkgver=12.1.1_git20220630 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-aarch64 -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for aarch64" url="https://gcc.gnu.org" arch="x86_64" @@ -40,7 +40,7 @@ _gccrel=$pkgver-r$pkgrel depends="binutils-aarch64 mpc1" 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" +subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" replaces="libstdc++ binutils" @@ -53,7 +53,7 @@ replaces="libstdc++ binutils" : "${LANG_JIT:=true}" _libgomp=true -_libgcc=true +_libgcc=false _libatomic=true _libitm=true @@ -555,16 +555,16 @@ libcxx_dev() { depends= replaces="g++" - amove usr/lib/libstdc++.a \ - usr/lib/libstdc++.so \ - usr/lib/libstdc++fs.a \ - usr/lib/libsupc++.a \ - usr/include/c++ + amove usr/${_target:+$CTARGET/}lib/libstdc++.a \ + usr/${_target:+$CTARGET/}lib/libstdc++.so \ + usr/${_target:+$CTARGET/}lib/libstdc++fs.a \ + usr/${_target:+$CTARGET/}lib/libsupc++.a \ + usr/${_target:+$CTARGET/}include/c++ } gpp() { pkgdesc="GNU C++ standard library and compiler" - depends="libstdc++=$_gccrel libstdc++-dev=$_gccrel gcc=$_gccrel libc-dev" + depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev" mkdir -p "$subpkgdir/$_gcclibexec" \ "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/${_target:+$CTARGET/}include \ diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index 5afd624fd..a72f39846 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -31,7 +31,7 @@ pkgver=12.1.1_git20220630 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armhf -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for armhf" url="https://gcc.gnu.org" arch="x86_64" @@ -40,7 +40,7 @@ _gccrel=$pkgver-r$pkgrel depends="binutils-armhf mpc1" 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" +subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" replaces="libstdc++ binutils" @@ -53,7 +53,7 @@ replaces="libstdc++ binutils" : "${LANG_JIT:=true}" _libgomp=true -_libgcc=true +_libgcc=false _libatomic=true _libitm=true @@ -555,16 +555,16 @@ libcxx_dev() { depends= replaces="g++" - amove usr/lib/libstdc++.a \ - usr/lib/libstdc++.so \ - usr/lib/libstdc++fs.a \ - usr/lib/libsupc++.a \ - usr/include/c++ + amove usr/${_target:+$CTARGET/}lib/libstdc++.a \ + usr/${_target:+$CTARGET/}lib/libstdc++.so \ + usr/${_target:+$CTARGET/}lib/libstdc++fs.a \ + usr/${_target:+$CTARGET/}lib/libsupc++.a \ + usr/${_target:+$CTARGET/}include/c++ } gpp() { pkgdesc="GNU C++ standard library and compiler" - depends="libstdc++=$_gccrel libstdc++-dev=$_gccrel gcc=$_gccrel libc-dev" + depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev" mkdir -p "$subpkgdir/$_gcclibexec" \ "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/${_target:+$CTARGET/}include \ diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index f7e4d7247..bd471af5d 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -31,7 +31,7 @@ pkgver=12.1.1_git20220630 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armv7 -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for armv7" url="https://gcc.gnu.org" arch="x86_64" @@ -40,7 +40,7 @@ _gccrel=$pkgver-r$pkgrel depends="binutils-armv7 mpc1" 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" +subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" replaces="libstdc++ binutils" @@ -53,7 +53,7 @@ replaces="libstdc++ binutils" : "${LANG_JIT:=true}" _libgomp=true -_libgcc=true +_libgcc=false _libatomic=true _libitm=true @@ -555,16 +555,16 @@ libcxx_dev() { depends= replaces="g++" - amove usr/lib/libstdc++.a \ - usr/lib/libstdc++.so \ - usr/lib/libstdc++fs.a \ - usr/lib/libsupc++.a \ - usr/include/c++ + amove usr/${_target:+$CTARGET/}lib/libstdc++.a \ + usr/${_target:+$CTARGET/}lib/libstdc++.so \ + usr/${_target:+$CTARGET/}lib/libstdc++fs.a \ + usr/${_target:+$CTARGET/}lib/libsupc++.a \ + usr/${_target:+$CTARGET/}include/c++ } gpp() { pkgdesc="GNU C++ standard library and compiler" - depends="libstdc++=$_gccrel libstdc++-dev=$_gccrel gcc=$_gccrel libc-dev" + depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev" mkdir -p "$subpkgdir/$_gcclibexec" \ "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/${_target:+$CTARGET/}include \