use the new gbuild way to update config.*

Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6
Reviewed-on: https://gerrit.libreoffice.org/42941Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>

external/coinmp/UnpackedTarball_coinmp.mk

@@ -17,6 +17,18 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\
+	BuildTools \
+	Cbc \
+	Cgl \
+	Clp \
+	CoinMP \
+	CoinUtils \
+	Data/Sample \
+	Osi \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/osi_cuts_iterator.patch.0 \
 	external/coinmp/no-binaries.patch.1 \
@@ -28,8 +40,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/ubsan.patch.0 \
 	external/coinmp/rpath.patch \
 	external/coinmp/libtool.patch \
-	external/coinmp/automake.patch \
-	external/coinmp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/coinmp/iOS.patch.1

-diff -Naur coinmp/BuildTools/config.sub coinmp_new/BuildTools/config.sub
---- coinmp/BuildTools/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/BuildTools/config.sub	2017-09-06 17:37:36.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/Cbc/config.sub coinmp_new/Cbc/config.sub
---- coinmp/Cbc/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/Cbc/config.sub	2017-09-06 17:38:09.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/Cgl/config.sub coinmp_new/Cgl/config.sub
---- coinmp/Cgl/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/Cgl/config.sub	2017-09-06 17:38:32.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/Clp/config.sub coinmp_new/Clp/config.sub
---- coinmp/Clp/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/Clp/config.sub	2017-09-06 17:38:54.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/CoinMP/config.sub coinmp_new/CoinMP/config.sub
---- coinmp/CoinMP/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/CoinMP/config.sub	2017-09-06 17:39:21.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/CoinUtils/config.sub coinmp_new/CoinUtils/config.sub
---- coinmp/CoinUtils/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/CoinUtils/config.sub	2017-09-06 17:39:43.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/Data/Sample/config.sub coinmp_new/Data/Sample/config.sub
---- coinmp/Data/Sample/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/Data/Sample/config.sub	2017-09-06 17:40:21.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/Osi/config.sub coinmp_new/Osi/config.sub
---- coinmp/Osi/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/Osi/config.sub	2017-09-06 17:40:38.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
-diff -Naur coinmp/config.sub coinmp_new/config.sub
---- coinmp/config.sub	2017-09-06 17:32:53.000000000 +0200
-+++ coinmp_new/config.sub	2017-09-06 17:40:02.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/firebird/UnpackedTarball_firebird.mk

@@ -13,6 +13,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,firebird,\
+	builds/make.new/config \
+	extern/editline \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
         external/firebird/firebird.disable-ib-util-not-found.patch.1 \
 		external/firebird/firebird-Engine12.patch \
@@ -23,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 		external/firebird/libc++.patch \
 		external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 \
 		external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \
-		external/firebird/automake.patch \
 ))
 
 ifeq ($(OS),WNT)

external/libabw/UnpackedTarball_libabw.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
@@ -21,8 +23,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-    external/libabw/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libabw/iOS.patch.0

---- config.sub	2014-03-29 11:28:53.000000000 +0100
-+++ config.sub	2017-06-12 17:37:29.000000000 +0200
-@@ -257,7 +257,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -370,7 +370,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-* \

external/libcdr/UnpackedTarball_libcdr.mk

@@ -13,9 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
-    external/libcdr/iOS.patch \
-))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \

external/libcdr/iOS.patch

---- config.sub
-+++ config.sub
-@@ -250,7 +250,7 @@
- 	| 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 \
-@@ -358,7 +358,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-* \

external/libebook/UnpackedTarball_libebook.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libebook, \
     external/libebook/ubsan.patch \
     external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \
@@ -26,8 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libebook, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
-    external/libebook/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libebook/iOS.patch.0

---- config.sub	2013-06-15 20:18:09.000000000 +0200
-+++ config.sub	2017-06-12 17:51:02.000000000 +0200
-@@ -253,7 +253,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 \
-@@ -365,7 +366,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-* \

external/libetonyek/UnpackedTarball_libetonyek.mk

@@ -13,13 +13,14 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libetonyek))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/win_build.patch.1 \
 	external/libetonyek/ubsan.patch \
 	external/libetonyek/rpath.patch \
 	external/libetonyek/silence-libxml.patch \
 	external/libetonyek/0001-fix-brain-fart.patch.1 \
-	external/libetonyek/iOS.patch.0 \
 ))
 
 ifneq ($(OS),MACOSX)

external/libetonyek/iOS.patch.0

---- config.sub	2014-03-29 11:29:01.000000000 +0100
-+++ config.sub	2017-06-12 17:56:15.000000000 +0200
-@@ -257,7 +257,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -370,7 +370,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-* \

external/libfreehand/UnpackedTarball_libfreehand.mk

@@ -13,9 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libfreehand,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
-    external/libfreehand/iOS.patch \
-))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libfreehand))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \

external/libfreehand/iOS.patch

---- config.sub
-+++ config.sub
-@@ -253,7 +253,7 @@
- 	| 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 \
-@@ -365,7 +365,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-* \

external/libmspub/UnpackedTarball_libmspub.mk

@@ -13,9 +13,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
     external/libmspub/ubsan.patch \
-    external/libmspub/automake.patch \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
@@ -26,7 +27,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
-    external/libmspub/iOS.patch.0 \
-))
 # vim: set noet sw=4 ts=4:

external/libmspub/iOS.patch.0

---- config.sub	2012-06-30 14:54:32.000000000 +0200
-+++ config.sub	2017-06-13 12:15:26.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libmwaw/UnpackedTarball_libmwaw.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
@@ -36,7 +38,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-    external/libmwaw/iOS.patch.0 \
     external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 \
 ))
 

external/libmwaw/iOS.patch.0

---- config.sub	2013-08-14 11:17:40.000000000 +0200
-+++ config.sub	2017-06-13 12:26:55.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -367,7 +367,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libodfgen/UnpackedTarball_libodfgen.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
@@ -37,7 +39,6 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 	external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \
-	external/libodfgen/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libodfgen/iOS.patch.0

---- config.sub	2013-05-16 09:13:10.000000000 +0200
-+++ config.sub	2017-06-13 13:42:55.000000000 +0200
-@@ -253,7 +253,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 \
-@@ -365,7 +366,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-* \

external/liborcus/UnpackedTarball_liborcus.mk

@@ -13,11 +13,12 @@ $(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
+
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
 	external/liborcus/rpath.patch.0 \
 	external/liborcus/visibility.patch.0 \
-	external/liborcus/iOS.patch \
 	external/liborcus/nullptr-in-ostringstream.patch.1 \
 	external/liborcus/orcus_allow_missing_xml_header.patch.1 \
 	external/liborcus/orcus_allow_underscore_in_names.patch.1 \

external/liborcus/iOS.patch

---- a/config.sub
-+++ b/config.sub
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -367,7 +367,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libpagemaker/UnpackedTarball_libpagemaker.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libpagemaker))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
@@ -21,8 +23,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
-    external/libpagemaker/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libpagemaker/iOS.patch.0

---- config.sub	2016-02-18 09:18:26.000000000 +0100
-+++ config.sub	2017-06-13 13:16:43.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libqxp/UnpackedTarball_libqxp.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
@@ -26,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
 	external/libqxp/0001-add-missing-includes.patch.1 \
 	external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
 	external/libqxp/android-workaround.patch.1 \
-	external/libqxp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libqxp/iOS.patch.1

-diff -Naur libqxp/config.sub libqxp.new/config.sub
---- libqxp/config.sub	2017-08-26 08:39:26.000000000 +0200
-+++ libqxp.new/config.sub	2017-09-04 21:50:24.000000000 +0200
-@@ -252,7 +252,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| ba \
- 	| be32 | be64 \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64* \
- 	| avr-* | avr32-* \
- 	| ba-* \
- 	| be32-* | be64-* \

external/libstaroffice/UnpackedTarball_libstaroffice.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libstaroffice,$(STAROFFICE_TARBALL)
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libstaroffice,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libstaroffice))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
@@ -36,7 +38,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
-	external/libstaroffice/iOS.patch.0 \
 	external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 \
 ))
 

external/libstaroffice/iOS.patch.0

---- config.sub	2015-07-20 13:14:51.000000000 +0200
-+++ config.sub	2017-06-13 13:38:11.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -368,7 +368,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libvisio/UnpackedTarball_libvisio.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libvisio))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
     external/libvisio/ubsan.patch \
 ))
@@ -25,8 +27,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
-    external/libvisio/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libvisio/iOS.patch.0

---- config.sub	2015-12-29 20:42:59.000000000 +0100
-+++ config.sub	2017-06-13 13:24:25.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libwpd/UnpackedTarball_libwpd.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpd))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
 	external/libwpd/libwpd-vs2013.patch.1 \
 	$(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \
@@ -26,8 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
-	external/libwpd/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libwpd/iOS.patch.0

---- config.sub	2013-05-16 08:47:04.000000000 +0200
-+++ config.sub	2017-06-13 13:28:55.000000000 +0200
-@@ -253,7 +253,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 \
-@@ -365,7 +366,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-* \

external/libwpg/UnpackedTarball_libwpg.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpg))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
     external/libwpg/rpath.patch \
 ))
@@ -25,8 +27,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
-    external/libwpg/iOS.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/libwpg/iOS.patch.0

---- config.sub	2013-05-16 08:38:47.000000000 +0200
-+++ config.sub	2017-06-13 13:34:55.000000000 +0200
-@@ -253,7 +253,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 \
-@@ -365,7 +366,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-* \

external/libwps/UnpackedTarball_libwps.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwps))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
@@ -34,7 +36,6 @@ endif
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
-    external/libwps/iOS.patch.0 \
     external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 \
 ))
 

external/libwps/iOS.patch.0

---- config.sub	2014-02-04 09:33:52.000000000 +0100
-+++ config.sub	2017-06-13 12:39:43.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -368,7 +368,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libxslt/UnpackedTarball_libxslt.mk

@@ -11,13 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libxslt))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libxslt,$(LIBXSLT_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxslt))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
 	external/libxslt/libxslt-config.patch.1 \
 	external/libxslt/libxslt-internal-symbols.patch.1 \
 	external/libxslt/libxslt-msvc.patch.2 \
 	external/libxslt/libxslt-1.1.26-memdump.patch \
 	external/libxslt/rpath.patch.0 \
-	external/libxslt/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libxslt/iOS.patch.0

---- config.sub	2015-07-07 12:55:08.000000000 +0200
-+++ config.sub	2017-06-13 09:07:36.000000000 +0200
-@@ -253,7 +253,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arceb \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -374,7 +374,7 @@
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
--	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- 	| avr-* | avr32-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \

external/libzmf/UnpackedTarball_libzmf.mk

@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libzmf,$(ZMF_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libzmf,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libzmf))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
@@ -22,7 +24,6 @@ endif
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
-    external/libzmf/iOS.patch \
     external/libzmf/android-workaround.patch.1 \
 ))
 

external/libzmf/iOS.patch

---- config.sub
-+++ config.sub
-@@ -253,7 +253,7 @@
- 	| 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 \
-@@ -365,7 +365,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-* \

external/mythes/UnpackedTarball_mythes.mk

@@ -11,10 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mythes))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,mythes))
+
 $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
 	external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
 	external/mythes/mythes-fdo48017-wfopen.patch \
-	external/mythes/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:

external/mythes/iOS.patch.0

---- config.sub	2014-06-27 10:20:11.000000000 +0200
-+++ config.sub	2017-06-13 10:28:35.000000000 +0200
-@@ -257,7 +257,7 @@
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc \
--	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- 	| avr | avr32 \
- 	| be32 | be64 \
- 	| bfin \
-@@ -370,7 +370,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-* \

external/openldap/UnpackedTarball_openldap.mk

@@ -13,9 +13,13 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openl
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,openldap,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,openldap,\
+	build \
+	contrib/ldapc++ \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
 	external/openldap/openldap-2.4.44.patch.1 \
-	external/openldap/automake.patch \
 ))
 
 # vim: set noet sw=4 ts=4: