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/libqxp | |
| 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/libqxp')
| -rw-r--r-- | external/libqxp/UnpackedTarball_libqxp.mk | 3 | ||||
| -rw-r--r-- | external/libqxp/iOS.patch.1 | 21 |
2 files changed, 2 insertions, 22 deletions
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk index e39ea71a976c..b630fc2981b9 100644 --- a/external/libqxp/UnpackedTarball_libqxp.mk +++ b/external/libqxp/UnpackedTarball_libqxp.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \ @@ -26,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \ external/libqxp/0001-add-missing-includes.patch.1 \ external/libqxp/0001-WaE-narrowing-conversion.patch.1 \ external/libqxp/android-workaround.patch.1 \ - external/libqxp/iOS.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libqxp/iOS.patch.1 b/external/libqxp/iOS.patch.1 deleted file mode 100644 index 28082edbee2e..000000000000 --- a/external/libqxp/iOS.patch.1 +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur libqxp/config.sub libqxp.new/config.sub ---- libqxp/config.sub 2017-08-26 08:39:26.000000000 +0200 -+++ libqxp.new/config.sub 2017-09-04 21:50:24.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-* \ |