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/expat | |
| parent | Revert "iOS, removed unneeded avmedia libraries" (diff) | |
| download | core-1bae5c02efff0faa89f3f61b8a51b87ac0f46b73.tar.gz core-1bae5c02efff0faa89f3f61b8a51b87ac0f46b73.zip | |
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/expat')
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk | 3 | ||||
| -rw-r--r-- | external/expat/expat-iOS.patch | 20 |
2 files changed, 2 insertions, 21 deletions
diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 1725aefb4c45..7c83f65af284 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -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. diff --git a/external/expat/expat-iOS.patch b/external/expat/expat-iOS.patch deleted file mode 100644 index 4f1812b9d071..000000000000 --- a/external/expat/expat-iOS.patch +++ /dev/null @@ -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-* \ |