redland: update autoconf configs the gbuild way

Change-Id: I8a46a2ee60bb028c7fd9edcfdcd389813498ba9b

7 files changed, 9 insertions, 88 deletions

diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index daf4e0c64bca..517b11a3d14f 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,raptor,build))
+
 # configure generated files for MSVC
 $(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h))
 $(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h))
@@ -27,7 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	external/redland/raptor/xml2-config.patch \
 	external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \
 	external/redland/raptor/libtool.patch \
-	external/redland/raptor/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
index 5bd7fb803dc7..bb44f39a6f5a 100644
--- a/external/redland/UnpackedTarball_rasqal.mk
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,rasqal,build))
+
 # configure generated files for MSVC
 $(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h))
 
@@ -27,7 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
 	external/redland/rasqal/rpath.patch \
 	external/redland/rasqal/clang-cl.patch \
 	external/redland/rasqal/libtool.patch \
-	external/redland/rasqal/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
index 8a4e8f4617dc..66e766d20fee 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,redland))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,redland,\
+	build \
+	libltdl/config \
+))
+
 # configure generated files for MSVC
 $(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h))
 
@@ -28,8 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
 	external/redland/redland/rpath.patch \
 	external/redland/redland/clang-cl.patch \
 	external/redland/redland/libtool.patch \
-	external/redland/redland/iOS.patch.0 \
-	external/redland/redland/iOS-libltdl.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/iOS.patch.0 b/external/redland/raptor/iOS.patch.0
deleted file mode 100644
index ecd51db1b720..000000000000
--- a/external/redland/raptor/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub	2014-11-02 07:04:37.000000000 +0100
-+++ build/config.sub	2017-06-13 09:17:33.000000000 +0200
-@@ -259,7 +259,8 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+        | avr | avr32 \
-         | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
-@@ -371,7 +372,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
diff --git a/external/redland/rasqal/iOS.patch.0 b/external/redland/rasqal/iOS.patch.0
deleted file mode 100644
index 5d34175ef9cf..000000000000
--- a/external/redland/rasqal/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub	2014-03-17 03:39:35.000000000 +0100
-+++ build/config.sub	2017-06-13 09:44:04.000000000 +0200
-@@ -259,7 +259,8 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+        | avr | avr32 \
-         | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
-@@ -371,7 +372,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
diff --git a/external/redland/redland/iOS-libltdl.patch.0 b/external/redland/redland/iOS-libltdl.patch.0
deleted file mode 100644
index 6f26d591ace0..000000000000
--- a/external/redland/redland/iOS-libltdl.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- libltdl/config/config.sub	2013-06-09 22:45:46.000000000 +0200
-+++ libltdl/config/config.sub	2017-06-13 10:05:41.000000000 +0200
-@@ -259,7 +259,8 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+        | avr | avr32 \
-         | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
-@@ -371,7 +372,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
diff --git a/external/redland/redland/iOS.patch.0 b/external/redland/redland/iOS.patch.0
deleted file mode 100644
index facaa0c0ee77..000000000000
--- a/external/redland/redland/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub	2013-06-09 22:45:51.000000000 +0200
-+++ build/config.sub	2017-06-13 09:48:08.000000000 +0200
-@@ -259,7 +259,8 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+        | avr | avr32 \
-         | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
-@@ -371,7 +372,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \