From 0050519fa685a47499c3d9ff1cec66719847953b Mon Sep 17 00:00:00 2001
From: Aelin <aelin@postmarketos.org>
Date: Fri, 29 May 2026 22:06:19 +0200
Subject: [PATCH] cross/gcc-*: Upgrade to 15.2.0-r5

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8675>
---
 cross/gcc-aarch64/APKBUILD     | 12 +++++++++---
 cross/gcc-armhf/APKBUILD       | 12 +++++++++---
 cross/gcc-armv7/APKBUILD       | 12 +++++++++---
 cross/gcc-loongarch64/APKBUILD | 12 +++++++++---
 cross/gcc-ppc64le/APKBUILD     | 12 +++++++++---
 cross/gcc-riscv64/APKBUILD     | 12 +++++++++---
 cross/gcc-x86/APKBUILD         | 12 +++++++++---
 cross/gcc-x86_64/APKBUILD      | 12 +++++++++---
 8 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index 40ae41e78..e265c9b4f 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -34,7 +34,7 @@ _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"
@@ -179,7 +179,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -630,7 +630,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index ecf980aad..b678900a7 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -34,7 +34,7 @@ _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="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index 787d9e703..38461d0b5 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -34,7 +34,7 @@ _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="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-loongarch64/APKBUILD b/cross/gcc-loongarch64/APKBUILD
index ba2e28f98..1edf6ee7f 100644
--- a/cross/gcc-loongarch64/APKBUILD
+++ b/cross/gcc-loongarch64/APKBUILD
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-loongarch64
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-ppc64le/APKBUILD b/cross/gcc-ppc64le/APKBUILD
index df500091e..1c414f24f 100644
--- a/cross/gcc-ppc64le/APKBUILD
+++ b/cross/gcc-ppc64le/APKBUILD
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-ppc64le
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-riscv64/APKBUILD b/cross/gcc-riscv64/APKBUILD
index eb7b05d78..5146a58d7 100644
--- a/cross/gcc-riscv64/APKBUILD
+++ b/cross/gcc-riscv64/APKBUILD
@@ -34,7 +34,7 @@ _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="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-x86/APKBUILD b/cross/gcc-x86/APKBUILD
index efd3dfa96..8aff554a1 100644
--- a/cross/gcc-x86/APKBUILD
+++ b/cross/gcc-x86/APKBUILD
@@ -34,7 +34,7 @@ _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="aarch64 x86_64"
@@ -180,7 +180,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -632,7 +632,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a
diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD
index ab7f7beb3..5b392661b 100644
--- a/cross/gcc-x86_64/APKBUILD
+++ b/cross/gcc-x86_64/APKBUILD
@@ -34,7 +34,7 @@ _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"
@@ -179,7 +179,7 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
+$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -630,7 +630,13 @@ libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	amove usr/lib/libgcc_s.so*
+	amove usr/lib/libgcc_s.so.*
+}
+
+libgccstatic() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a