From f2db08b28e99c61c44bc057d03de926ac33d93b7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 29 Sep 2017 13:11:20 +0200 Subject: use the new gbuild way to update config.* Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6 Reviewed-on: https://gerrit.libreoffice.org/42941 Tested-by: Jenkins Reviewed-by: David Tardon --- external/libebook/UnpackedTarball_libebook.mk | 6 ++---- external/libebook/iOS.patch.0 | 21 --------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 external/libebook/iOS.patch.0 (limited to 'external/libebook') diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk index 250d059efec4..353a79f761ac 100644 --- a/external/libebook/UnpackedTarball_libebook.mk +++ b/external/libebook/UnpackedTarball_libebook.mk @@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook)) + $(eval $(call gb_UnpackedTarball_add_patches,libebook, \ external/libebook/ubsan.patch \ external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \ @@ -26,8 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libebook, \ endif endif -$(eval $(call gb_UnpackedTarball_add_patches,libebook, \ - external/libebook/iOS.patch.0 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libebook/iOS.patch.0 b/external/libebook/iOS.patch.0 deleted file mode 100644 index 325b928913e1..000000000000 --- a/external/libebook/iOS.patch.0 +++ /dev/null @@ -1,21 +0,0 @@ ---- config.sub 2013-06-15 20:18:09.000000000 +0200 -+++ config.sub 2017-06-12 17:51:02.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-* \ -- cgit