strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use gbuild way to update config.*, continued

Browse source 
Change-Id: I9abf1742c213f47c576ffbb7dafd33087f7037e5
Reviewed-on: https://gerrit.libreoffice.org/43307
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon 2017-10-10 11:17:34 +02:00
parent 134705c5c2
commit 1bae5c02ef
18 changed files with 19 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
external/expat/UnpackedTarball_expat.mk vendored
View file

@ -11,9 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat))
$(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
$(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
external/expat/expat-iOS.patch \
))
# This is a bit hackish.

20
external/expat/expat-iOS.patch vendored
View file

@ -1,20 +0,0 @@
--- misc/expat-2.1.0/conftools/config.sub 2016-04-30 21:24:14.000000000 +0200
+++ misc/build/expat-2.1.0/conftools/config.sub 2017-06-11 10:56:49.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-* \

3
external/hyphen/UnpackedTarball_hyphen.mk vendored
View file

@ -11,10 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen))
$(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,hyphen))
$(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
external/hyphen/hyphen-iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:

20
external/hyphen/hyphen-iOS.patch.0 vendored
View file

@ -1,20 +0,0 @@
--- config.sub 2014-06-27 10:59:40.000000000 +0200
+++ config.sub 2017-06-12 17:03:16.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-* \

3
external/icu/UnpackedTarball_icu.mk vendored
View file

@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
$(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,icu,source))
# Data zip contains data/... and needs to end up in icu/source/data/...
# Only data/misc/icudata.rc is needed for a Cygwin/MSVC build.
$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
@ -34,7 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-59-werror-undef.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
external/icu/icu4c-iOS.patch.1 \
external/icu/icu4c-59-icu13329-xlocale.patch.1 \
))

21
external/icu/icu4c-iOS.patch.1 vendored
View file

@ -1,21 +0,0 @@
diff -ur icu.org/source/config.sub icu/source/config.sub
--- icu.org/source/config.sub 2017-01-19 19:12:50.000000000 +0100
+++ icu/source/config.sub 2017-06-10 20:07:19.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-* \

4
external/lcms2/UnpackedTarball_lcms2.mk vendored
View file

@ -10,13 +10,15 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,lcms2))
$(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,lcms2))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2-2.4-windows.patch \
external/lcms2/lcms2-msvc-disable-sse2.patch.1 \
external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 \
external/lcms2/lcms2-iOS.patch.1 \
))
# vim: set noet sw=4 ts=4:

21
external/lcms2/lcms2-iOS.patch.1 vendored
View file

@ -1,21 +0,0 @@
diff -ur lcms2.org/config.sub lcms2/config.sub
--- lcms2.org/config.sub 2017-06-10 21:38:29.000000000 +0200
+++ lcms2/config.sub 2017-06-10 23:05: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-* \

8
external/libexttextcat/UnpackedTarball_libexttextcat.mk vendored
View file

@ -9,12 +9,8 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libexttextcat,0))
$(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
external/libexttextcat/exttextcat-iOS.patch.1 \
))
$(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libexttextcat))
# vim: set noet sw=4 ts=4:

20
external/libexttextcat/exttextcat-iOS.patch.1 vendored
View file

@ -1,20 +0,0 @@
--- libexttextcat.org/config.sub 2014-06-27 12:16:52.000000000 +0200
+++ libexttextcat/config.sub 2017-06-11 11:39:17.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-* \

3
external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk vendored
View file

@ -11,13 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libjpeg-turbo))
$(eval $(call gb_UnpackedTarball_set_tarball,libjpeg-turbo,$(LIBJPEG_TURBO_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libjpeg-turbo))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0))
$(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\
external/libjpeg-turbo/jpeg-turbo.build.patch.1 \
$(if $(filter WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \
external/libjpeg-turbo/ubsan.patch \
external/libjpeg-turbo/jpeg-turbo.iOS.patch.1 \
))
# vim: set noet sw=4 ts=4:

20
external/libjpeg-turbo/jpeg-turbo.iOS.patch.1 vendored
View file

@ -1,20 +0,0 @@
--- jpeg.org/config.sub 2017-06-10 20:48:27.000000000 +0200
+++ jpeg/config.sub 2017-06-10 20:53:22.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-* \

3
external/liblangtag/UnpackedTarball_liblangtag.mk vendored
View file

@ -15,6 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\
$(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag))
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
@ -27,7 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
$(if $(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
external/liblangtag/clang-cl.patch.0 \
external/liblangtag/langtag-valencia.patch.0 \
external/liblangtag/langtag-iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:

20
external/liblangtag/langtag-iOS.patch.0 vendored
View file

@ -1,20 +0,0 @@
--- config.sub
+++ 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 \
@@ -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-* \

3
external/librevenge/UnpackedTarball_librevenge.mk vendored
View file

@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,librevenge))
$(eval $(call gb_UnpackedTarball_set_tarball,librevenge,$(REVENGE_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,librevenge))
$(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0))
ifeq ($(COM_IS_CLANG),TRUE)
@ -25,7 +27,6 @@ ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
external/librevenge/librevenge-bundled-soname.patch.0 \
external/librevenge/librevenge-iOS.patch.0 \
))
endif
endif

20
external/librevenge/librevenge-iOS.patch.0 vendored
View file

@ -1,20 +0,0 @@
--- config.sub 2014-05-08 14:03:43.000000000 +0200
+++ config.sub 2017-06-12 17:33:01.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-* \

3
external/libxml2/UnpackedTarball_libxml2.mk vendored
View file

@ -11,13 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libxml2))
$(eval $(call gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2))
$(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-config.patch.1 \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
external/libxml2/libxml2-iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:

21
external/libxml2/libxml2-iOS.patch.0 vendored
View file

@ -1,21 +0,0 @@
diff -ur libxml2.org/config.sub libxml2/config.sub
--- config.sub 2017-06-11 08:01:59.000000000 +0200
+++ config.sub 2017-06-11 08:03:06.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-* \