From ed3ba95558a7cbc6cbee129e2170a13cb930f2af Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Thu, 30 Jun 2022 15:39:20 -0700
Subject: [PATCH] cross/gcc-*: upgrade to 11.2.1_git20220219-r3

---
 cross/gcc-aarch64/APKBUILD | 5 +++--
 cross/gcc-armhf/APKBUILD   | 5 +++--
 cross/gcc-armv7/APKBUILD   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index 1d93ecf10..033177722 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -593,6 +593,7 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -704,7 +705,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap"
+	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 06548ef87..3c6f065d2 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -593,6 +593,7 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -704,7 +705,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap"
+	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index c54f4b06d..4d1ec8f93 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -593,6 +593,7 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -704,7 +705,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap"
+	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \