summaryrefslogtreecommitdiff
path: root/external/liblangtag
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-10-10 11:17:34 +0200
committerDavid Tardon <dtardon@redhat.com>2017-10-10 12:53:45 +0200
commit1bae5c02efff0faa89f3f61b8a51b87ac0f46b73 (patch)
treeb040149d84d23583f25254f72957c679910a7a50 /external/liblangtag
parent134705c5c2a7ce652acb23dc42609a65b56c562d (diff)
use gbuild way to update config.*, continued
Change-Id: I9abf1742c213f47c576ffbb7dafd33087f7037e5 Reviewed-on: https://gerrit.libreoffice.org/43307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/liblangtag')
-rw-r--r--external/liblangtag/UnpackedTarball_liblangtag.mk3
-rw-r--r--external/liblangtag/langtag-iOS.patch.020
2 files changed, 2 insertions, 21 deletions
diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk b/external/liblangtag/UnpackedTarball_liblangtag.mk
index 61fa7cd4f5ca..cd52b169fa57 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -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:
diff --git a/external/liblangtag/langtag-iOS.patch.0 b/external/liblangtag/langtag-iOS.patch.0
deleted file mode 100644
index ffd4a39a815a..000000000000
--- a/external/liblangtag/langtag-iOS.patch.0
+++ /dev/null
@@ -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-* \