Add patch to fix gprbuild on non-english locales

4 files changed, 43 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37c9639e60b7..dddd82a07083 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gprbuild
 	pkgdesc = Builder for multi-language systems
 	pkgver = 21.0.0
-	pkgrel = 4
+	pkgrel = 5
 	epoch = 1
 	url = https://github.com/AdaCore/gprbuild/
 	arch = i686
@@ -15,11 +15,13 @@ pkgbase = gprbuild
 	source = relocatable-build.patch
 	source = always-use-host-gprinstall.patch
 	source = 0001-Use-ld-as-Library_Partial_Linker.patch
+	source = 0002-compilers.xml-use-gcc-version-to-get-version-number-.patch
 	sha256sums = 54b7d1a3298160109aaee4d8c263c1ab3ab4abae75d354f3e90a4c51639167a2
 	sha256sums = 2aec26afad5bb1a4685d9c041c9c797ff5beda211a5e81f2a97452d2ceabc557
 	sha256sums = d6479e03e6b6cfb09c133d94e3c47ea5d5e5e756b95554ab3106a679c3d57de4
 	sha256sums = 3fe0fd1df3156c9a8488d98ee6e7e822ae904ce410838661c8fc14c29abe2620
-	sha256sums = 1749c8cdecf42bec9103fd9d1b7f79556eeb37de5a51c115eda8368dba3cc7c0
+	sha256sums = b1a38e166f54d7b8e85f7351341109200c5712f7bfa79a9233adf8a24e036a3a
+	sha256sums = 9aa8cd9e522fb8a39b2512698885016db1b7286d8fe87d35bdc92e1bc10b20b7
 
 pkgname = libgpr
 	pkgdesc = Ada library to handle Gnat project files
diff --git a/0001-Use-ld-as-Library_Partial_Linker.patch b/0001-Use-ld-as-Library_Partial_Linker.patch
index 24316cb0d093..24c67cd7b0ea 100644
--- a/0001-Use-ld-as-Library_Partial_Linker.patch
+++ b/0001-Use-ld-as-Library_Partial_Linker.patch
@@ -1,7 +1,7 @@
 From f17b183cbc296edc7d5f3611053e47229a7cb4e2 Mon Sep 17 00:00:00 2001
 From: Xiretza <xiretza@xiretza.xyz>
 Date: Tue, 13 Jul 2021 20:18:29 +0200
-Subject: [PATCH] Use ld as Library_Partial_Linker
+Subject: [PATCH 1/2] Use ld as Library_Partial_Linker
 
 Arch's GCC is built with --enable-default-pie, so if it's used as a linker
 frontend, it passes -pie to ld internally. Because -pie is incompatible
@@ -35,5 +35,5 @@ index e14f4fb..6f85636 100644
    </configuration>
  
 -- 
-2.32.0
+2.34.1
 
diff --git a/0002-compilers.xml-use-gcc-version-to-get-version-number-.patch b/0002-compilers.xml-use-gcc-version-to-get-version-number-.patch
new file mode 100644
index 000000000000..6dfa210d32c8
--- /dev/null
+++ b/0002-compilers.xml-use-gcc-version-to-get-version-number-.patch
@@ -0,0 +1,32 @@
+From 9853bdb0b04ec8cd28483b127699ebd9cb305a77 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sat, 4 Dec 2021 19:47:58 +0100
+Subject: [PATCH 2/2] compilers.xml: use gcc --version to get version number
+ instead of gcc -v
+
+The output of gcc -v is dependent on locale can thus break the regex.
+
+See also https://github.com/AdaCore/gprconfig_kb/issues/10
+---
+ db/compilers.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/db/compilers.xml b/db/compilers.xml
+index ac9a701..416329a 100644
+--- a/db/compilers.xml
++++ b/db/compilers.xml
+@@ -22,9 +22,9 @@
+     <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>
+       <nogrep regexp="for GNAT Pro"></nogrep>
+-      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
++      <grep regexp="^gcc \(GCC\) (\S+)" group="1"></grep>
+     </version>
+     <languages>C</languages>
+     <target>
+-- 
+2.34.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 0d892284a815..9f5060ecb65a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=gprbuild
 pkgname=(libgpr gprbuild)
 epoch=1
 pkgver=21.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Builder for multi-language systems"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/gprbuild/"
@@ -20,17 +20,20 @@ source=(
     'relocatable-build.patch'
     'always-use-host-gprinstall.patch'
     '0001-Use-ld-as-Library_Partial_Linker.patch'
+    '0002-compilers.xml-use-gcc-version-to-get-version-number-.patch'
 )
 sha256sums=('54b7d1a3298160109aaee4d8c263c1ab3ab4abae75d354f3e90a4c51639167a2'
             '2aec26afad5bb1a4685d9c041c9c797ff5beda211a5e81f2a97452d2ceabc557'
             'd6479e03e6b6cfb09c133d94e3c47ea5d5e5e756b95554ab3106a679c3d57de4'
             '3fe0fd1df3156c9a8488d98ee6e7e822ae904ce410838661c8fc14c29abe2620'
-            '1749c8cdecf42bec9103fd9d1b7f79556eeb37de5a51c115eda8368dba3cc7c0')
+            'b1a38e166f54d7b8e85f7351341109200c5712f7bfa79a9233adf8a24e036a3a'
+            '9aa8cd9e522fb8a39b2512698885016db1b7286d8fe87d35bdc92e1bc10b20b7')
 
 prepare() {
     cd "$srcdir/gprconfig_kb-$pkgver"
 
     patch -Np1 -i "$srcdir/0001-Use-ld-as-Library_Partial_Linker.patch"
+    patch -Np1 -i "$srcdir/0002-compilers.xml-use-gcc-version-to-get-version-number-.patch"
 
     cd "$srcdir/$pkgbase-$pkgver"