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/libzmf | |
| 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/libzmf')
| -rw-r--r-- | external/libzmf/UnpackedTarball_libzmf.mk | 3 | ||||
| -rw-r--r-- | external/libzmf/iOS.patch | 20 |
2 files changed, 2 insertions, 21 deletions
diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk index fb763c477816..3aafc660e9d5 100644 --- a/external/libzmf/UnpackedTarball_libzmf.mk +++ b/external/libzmf/UnpackedTarball_libzmf.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libzmf,$(ZMF_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libzmf,0)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libzmf)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \ @@ -22,7 +24,6 @@ endif endif $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \ - external/libzmf/iOS.patch \ external/libzmf/android-workaround.patch.1 \ )) diff --git a/external/libzmf/iOS.patch b/external/libzmf/iOS.patch deleted file mode 100644 index 972421214227..000000000000 --- a/external/libzmf/iOS.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- config.sub -+++ config.sub -@@ -253,7 +253,7 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | clipper \ -@@ -365,7 +365,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-* \ |