Update patches

4 files changed, 64 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfac07637310..a4266aa8f750 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gprbuild
 	pkgdesc = Builder for multi-language systems
 	pkgver = 2020
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AdaCore/gprbuild/
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = gprbuild
 	source = relocatable-build.patch
 	source = expose-cargs-and-largs-makefile.patch
 	sha1sums = 408ec35c3bb86bd227db3da55d3e1e0c572a56e3
-	sha1sums = 4aaab0df8b611750d2cb35973ed28823fb233989
-	sha1sums = db88bcb65d1a5f41c5b30e0c3dea996c47c4f5b9
+	sha1sums = 91b20bde99cf02410cdb2b74aa1adb014458a9b3
+	sha1sums = ddaf20842ed9879c3f1cb24b3eb7615d5cfe61a5
 
 pkgname = gprbuild
 
diff --git a/PKGBUILD b/PKGBUILD
index 358096d67281..7447978c7b43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=gprbuild
 _upstream_ver=2020-20200429-19BD2
 pkgver=2020
-pkgrel=1
+pkgrel=2
 pkgdesc="Builder for multi-language systems"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/gprbuild/"
@@ -20,8 +20,8 @@ source=("https://community.download.adacore.com/v1/${_checksum}?filename=${pkgna
         'relocatable-build.patch'
         'expose-cargs-and-largs-makefile.patch')
 sha1sums=('408ec35c3bb86bd227db3da55d3e1e0c572a56e3'
-          '4aaab0df8b611750d2cb35973ed28823fb233989'
-          'db88bcb65d1a5f41c5b30e0c3dea996c47c4f5b9')
+          '91b20bde99cf02410cdb2b74aa1adb014458a9b3'
+          'ddaf20842ed9879c3f1cb24b3eb7615d5cfe61a5')
 
 # Remove '-fvar-tracking-assignments' from DEBUG_CFLAGS since clang does not understand it.
 DEBUG_CFLAGS="-g"
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch
index 113a29a9bd7b..5021c9d78aec 100644
--- a/expose-cargs-and-largs-makefile.patch
+++ b/expose-cargs-and-largs-makefile.patch
@@ -1,28 +1,71 @@
-diff --git a/Makefile b/Makefile
-index b591cb9a..4d711028 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -67,6 +67,14 @@ else
+@@ -70,6 +70,14 @@
     LIBGPR_TYPES=static
  endif
  
 +ifneq ($(strip $(CFLAGS)),)
-+   CARGS := -cargs $(CFLAGS)
++   TOOLFLAGS += -cargs $(CFLAGS)
 +endif
 +
 +ifneq ($(strip $(LDFLAGS)),)
-+   LARGS := -largs $(LDFLAGS)
++   TOOLFLAGS += -largs $(LDFLAGS)
 +endif
 +
  # Used to pass extra options to GPRBUILD, like -d for instance
  GPRBUILD_OPTIONS=
  
-@@ -75,7 +83,7 @@ LIB_INSTALLER=gprinstall -p -f --target=$(TARGET) $(RBD) --prefix=${prefix}
- CLEANER=gprclean -q $(RBD)
+@@ -92,27 +100,27 @@
+ .PHONY: all distall gprbuild gprconfig gprclean gprinstall gprname gprls
+ 
+ build all:
+-	$(GPRBUILD_BUILDER)
++	$(GPRBUILD_BUILDER) $(TOOLFLAGS)
+ 
+ distall: all install
+ 
+ gprbuild:
+-	$(GPRBUILD_BUILDER) gprbuild-main.adb
++	$(GPRBUILD_BUILDER) gprbuild-main.adb $(TOOLFLAGS)
+ 
+ gprinstall:
+-	$(GPRBUILD_BUILDER) gprinstall-main.adb
++	$(GPRBUILD_BUILDER) gprinstall-main.adb $(TOOLFLAGS)
+ 
+ gprclean:
+-	$(GPRBUILD_BUILDER) gprclean-main.adb
++	$(GPRBUILD_BUILDER) gprclean-main.adb $(TOOLFLAGS)
+ 
+ gprconfig:
+-	$(GPRBUILD_BUILDER) gprconfig-main.adb
++	$(GPRBUILD_BUILDER) gprconfig-main.adb $(TOOLFLAGS)
+ 
+ gprname:
+-	$(GPRBUILD_BUILDER) gprname-main.adb
++	$(GPRBUILD_BUILDER) gprname-main.adb $(TOOLFLAGS)
+ 
+ gprls:
+-	$(GPRBUILD_BUILDER) gprls-main.adb
++	$(GPRBUILD_BUILDER) gprls-main.adb $(TOOLFLAGS)
+ 
+ #################################
+ # Gprbuild installation targets #
+@@ -140,15 +148,15 @@
+ 
+ libgpr.build.shared:
+ 	${BUILDER} -XLIBRARY_TYPE=relocatable \
+-		-XXMLADA_BUILD=relocatable $(GPR_GPR)
++		-XXMLADA_BUILD=relocatable $(GPR_GPR) $(TOOLFLAGS)
+ 
+ libgpr.build.static:
+ 	${BUILDER} -XLIBRARY_TYPE=static \
+-		-XXMLADA_BUILD=static $(GPR_GPR)
++		-XXMLADA_BUILD=static $(GPR_GPR) $(TOOLFLAGS)
+ 
+ libgpr.build.static-pic:
+ 	${BUILDER} -XLIBRARY_TYPE=static-pic \
+-		-XXMLADA_BUILD=static-pic $(GPR_GPR)
++		-XXMLADA_BUILD=static-pic $(GPR_GPR) $(TOOLFLAGS)
+ 
+ libgpr.install: libgpr.uninstall $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t))
  
- GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
--	-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
-+	-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable $(CARGS) $(LARGS)
- LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR)
- LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \
- 	--install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET)
diff --git a/relocatable-build.patch b/relocatable-build.patch
index 0ed02e6ba1a9..d6f7db3dd8cc 100644
--- a/relocatable-build.patch
+++ b/relocatable-build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -75,7 +75,7 @@
+@@ -78,7 +78,7 @@
  CLEANER=gprclean -q $(RBD)
  
  GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
@@ -8,4 +8,4 @@
 +	-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
  LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR)
  LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \
- 	--install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET)
+ 	--install-name=gpr \