diff options
| author | David Tardon <dtardon@redhat.com> | 2017-09-29 13:11:20 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-10-04 08:12:43 +0200 |
| commit | f2db08b28e99c61c44bc057d03de926ac33d93b7 (patch) | |
| tree | 5c1631b28831ccff870b0d24a8806a66d5e6dbd8 /external/liborcus | |
| parent | 4b5574ef48a4745a2073ca1b7c50169fdc83b068 (diff) | |
use the new gbuild way to update config.*
Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6
Reviewed-on: https://gerrit.libreoffice.org/42941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 3 | ||||
| -rw-r--r-- | external/liborcus/iOS.patch | 20 |
2 files changed, 2 insertions, 21 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 9a3359f1bf79..655aa496e2f2 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/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 \ diff --git a/external/liborcus/iOS.patch b/external/liborcus/iOS.patch deleted file mode 100644 index 1b5a1a70cc14..000000000000 --- a/external/liborcus/iOS.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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-* \ |