Update to version '23.0.0'.

4 files changed, 18 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5750b7ee467b..e16b6b6a564a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gprbuild
 	pkgdesc = Builder for multi-language systems
-	pkgver = 22.0.0
-	pkgrel = 2
+	pkgver = 23.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/gprbuild/
 	arch = i686
@@ -10,16 +10,14 @@ pkgbase = gprbuild
 	license = custom
 	makedepends = gprbuild-bootstrap
 	makedepends = xmlada
-	source = gprbuild-22.0.0.tar.gz::https://github.com/AdaCore/gprbuild//archive/v22.0.0.tar.gz
-	source = gprconfig_kb-22.0.0.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v22.0.0.tar.gz
+	source = gprbuild-23.0.0.tar.gz::https://github.com/AdaCore/gprbuild//archive/v23.0.0.tar.gz
+	source = gprconfig_kb-23.0.0.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v23.0.0.tar.gz
 	source = 0001-Makefile-build-relocatable-instead-of-static-binarie.patch
-	source = 0002-Makefile-always-use-host-gprinstall.patch
 	source = 0001-compilers.xml-use-gcc-version-to-get-version-number-.patch
-	sha256sums = 076e2b6ac0c7170753a6499094a6d30a98698aca2551c6796b3a617dd9ffc704
-	sha256sums = cc19437e0982d9af31e09ad7c42eac6a445dac65336bd53d67ba61f630be7f13
+	sha256sums = 141b403ea8a3f82b58b6a8690f8409fe295f3692b667ba3ec487fafcbd26e389
+	sha256sums = 182d9108c91390ddd67c841e45a3fc9dd23a94b33d4a1f05ed2788c1fb9b7dd2
 	sha256sums = 6ebbea41d4b8b516d0646438338fb228ea907600a2ad2c594bab41a7e1c3680c
-	sha256sums = bcb0887eacce9ae609676c1965425847ab4fb27c5a5689f625c1864caeac8ad3
-	sha256sums = 42c66c412eb2e4949a754d660b04b77395d40d54b26a933ef7c75c5881e94238
+	sha256sums = ffa2a18febe9d8c512f81d66a58e73a6bd9f417aa3a8d8acfc1eab2047492569
 
 pkgname = libgpr
 	pkgdesc = Ada library to handle Gnat project files
diff --git a/0001-compilers.xml-use-gcc-version-to-get-version-number-.patch b/0001-compilers.xml-use-gcc-version-to-get-version-number-.patch
index 82f858a2a48f..d140363a759a 100644
--- a/0001-compilers.xml-use-gcc-version-to-get-version-number-.patch
+++ b/0001-compilers.xml-use-gcc-version-to-get-version-number-.patch
@@ -19,8 +19,8 @@ index f8909d2..eee25a2 100644
      <name>GCC</name>
      <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
      <version>
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc --version</external>
+-      <external>$EXEC -v</external>
++      <external>$EXEC --version</external>
        <nogrep regexp="for GNAT Pro"></nogrep>
 -      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
 +      <grep regexp="^gcc \(GCC\) (\S+)" group="1"></grep>
diff --git a/0002-Makefile-always-use-host-gprinstall.patch b/0002-Makefile-always-use-host-gprinstall.patch
deleted file mode 100644
index 1082ff84472c..000000000000
--- a/0002-Makefile-always-use-host-gprinstall.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c51a3fa53e4b13e8adcead066e59c2b464fd697f Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Sun, 23 Jan 2022 13:02:56 +0100
-Subject: [PATCH 2/2] Makefile: always use host gprinstall
-
-By default, the Makefile tries to use the freshly-built gprinstall to
-install itself - but since that binary required libgpr, which we are
-currently building, this can't work.
-
-Simply fall back to gprbuild-bootstrap's statically linked gprinstall.
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index d0750332..85b7cca4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,7 +40,7 @@ LIB_DIR       = lib/
- # target options for cross-build
- ifeq ($(HOST),$(TARGET))
- GTARGET=
--INSTALLER=exe/$(BUILD)/$(LIB_INSTALLER)
-+INSTALLER=$(LIB_INSTALLER)
- else
- GTARGET=--target=$(TARGET)
- INSTALLER=$(LIB_INSTALLER)
--- 
-2.34.1
-
diff --git a/PKGBUILD b/PKGBUILD
index e7a182ebefc3..dcedd39dce27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,26 +6,23 @@
 pkgbase=gprbuild
 pkgname=(libgpr gprbuild)
 epoch=1
-pkgver=22.0.0
-pkgrel=2
+pkgver=23.0.0
+pkgrel=1
 pkgdesc="Builder for multi-language systems"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/gprbuild/"
 license=('GPL3' 'custom')
 makedepends=('gprbuild-bootstrap' 'xmlada')
 
-source=(
-	"$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-	"gprconfig_kb-$pkgver.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v$pkgver.tar.gz"
+source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "gprconfig_kb-$pkgver.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v$pkgver.tar.gz"
         '0001-Makefile-build-relocatable-instead-of-static-binarie.patch'
-        '0002-Makefile-always-use-host-gprinstall.patch'
-        '0001-compilers.xml-use-gcc-version-to-get-version-number-.patch'
-)
-sha256sums=('076e2b6ac0c7170753a6499094a6d30a98698aca2551c6796b3a617dd9ffc704'
-            'cc19437e0982d9af31e09ad7c42eac6a445dac65336bd53d67ba61f630be7f13'
+        '0001-compilers.xml-use-gcc-version-to-get-version-number-.patch')
+
+sha256sums=('141b403ea8a3f82b58b6a8690f8409fe295f3692b667ba3ec487fafcbd26e389'
+            '182d9108c91390ddd67c841e45a3fc9dd23a94b33d4a1f05ed2788c1fb9b7dd2'
             '6ebbea41d4b8b516d0646438338fb228ea907600a2ad2c594bab41a7e1c3680c'
-            'bcb0887eacce9ae609676c1965425847ab4fb27c5a5689f625c1864caeac8ad3'
-            '42c66c412eb2e4949a754d660b04b77395d40d54b26a933ef7c75c5881e94238')
+            'ffa2a18febe9d8c512f81d66a58e73a6bd9f417aa3a8d8acfc1eab2047492569')
 
 prepare() {
     cd "$srcdir/gprconfig_kb-$pkgver"
@@ -35,7 +32,6 @@ prepare() {
     cd "$srcdir/$pkgbase-$pkgver"
 
     patch -Np1 -i "$srcdir/0001-Makefile-build-relocatable-instead-of-static-binarie.patch"
-    patch -Np1 -i "$srcdir/0002-Makefile-always-use-host-gprinstall.patch"
 
     ln -sfT "$srcdir/gprconfig_kb-$pkgver/db/" "share/gprconfig"