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/libodfgen | |
| 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/libodfgen')
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 3 | ||||
| -rw-r--r-- | external/libodfgen/iOS.patch.0 | 21 |
2 files changed, 2 insertions, 22 deletions
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index a6a45deaa3cc..10eb24fd77a7 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ @@ -37,7 +39,6 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ - external/libodfgen/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/iOS.patch.0 b/external/libodfgen/iOS.patch.0 deleted file mode 100644 index 39dd97dd419d..000000000000 --- a/external/libodfgen/iOS.patch.0 +++ /dev/null @@ -1,21 +0,0 @@ ---- config.sub 2013-05-16 09:13:10.000000000 +0200 -+++ config.sub 2017-06-13 13:42:55.000000000 +0200 -@@ -253,7 +253,8 @@ - | 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 +366,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-* \ |