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/libstaroffice | |
| 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/libstaroffice')
| -rw-r--r-- | external/libstaroffice/UnpackedTarball_libstaroffice.mk | 3 | ||||
| -rw-r--r-- | external/libstaroffice/iOS.patch.0 | 20 |
2 files changed, 2 insertions, 21 deletions
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 0fb024f195ae..5012b8c84591 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libstaroffice,$(STAROFFICE_TARBALL) $(eval $(call gb_UnpackedTarball_set_patchlevel,libstaroffice,0)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libstaroffice)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ @@ -36,7 +38,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ endif $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ - external/libstaroffice/iOS.patch.0 \ external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 \ )) diff --git a/external/libstaroffice/iOS.patch.0 b/external/libstaroffice/iOS.patch.0 deleted file mode 100644 index 378acfcf4e58..000000000000 --- a/external/libstaroffice/iOS.patch.0 +++ /dev/null @@ -1,20 +0,0 @@ ---- config.sub 2015-07-20 13:14:51.000000000 +0200 -+++ config.sub 2017-06-13 13:38:11.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-* \ |