diff options
| author | David Tardon <dtardon@redhat.com> | 2017-10-10 11:17:34 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-10-10 12:53:45 +0200 |
| commit | 1bae5c02efff0faa89f3f61b8a51b87ac0f46b73 (patch) | |
| tree | b040149d84d23583f25254f72957c679910a7a50 /external/icu | |
| parent | 134705c5c2a7ce652acb23dc42609a65b56c562d (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/icu')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 3 | ||||
| -rw-r--r-- | external/icu/icu4c-iOS.patch.1 | 21 |
2 files changed, 2 insertions, 22 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 7fa891f07d6d..ca523006307c 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -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 \ )) diff --git a/external/icu/icu4c-iOS.patch.1 b/external/icu/icu4c-iOS.patch.1 deleted file mode 100644 index 7661c7fe4915..000000000000 --- a/external/icu/icu4c-iOS.patch.1 +++ /dev/null @@ -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-* \ |