external/expat/UnpackedTarball_expat.mk | 1 + external/expat/expat-iOS.patch | 20 ++++++++++++++++++++ external/libxml2/UnpackedTarball_xml2.mk | 1 + external/libxml2/libxml2-iOS.patch.0 | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+)
New commits: commit e1b98561d3f48d0382c968b42e555038d88c3337 Author: jan Iversen <[email protected]> Date: Sun Jun 11 08:45:05 2017 +0200 iOS, patch for expat Support for arm64 Change-Id: Iedac1ee7d1b2ba7976ae56fdf24dd66d99f16264 diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 60e933d76090..abe0679f2f25 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,expat,\ external/expat/expat-winapi.patch \ + external/expat/expat-iOS.patch \ )) # This is a bit hackish. diff --git a/external/expat/expat-iOS.patch b/external/expat/expat-iOS.patch new file mode 100644 index 000000000000..4f1812b9d071 --- /dev/null +++ b/external/expat/expat-iOS.patch @@ -0,0 +1,20 @@ +--- misc/expat-2.1.0/conftools/config.sub 2016-04-30 21:24:14.000000000 +0200 ++++ misc/build/expat-2.1.0/conftools/config.sub 2017-06-11 10:56:49.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-* \ commit 85bef3844080816e818263bcbaadfff928618748 Author: jan Iversen <[email protected]> Date: Sun Jun 11 08:27:46 2017 +0200 iOS, patch for libxml2 Added support for arm64 Change-Id: Ibd13dc2c56e2caffd97b1f3b78caece2d331b51c diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk index a683d28ead78..93faa7563ee2 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ external/libxml2/libxml2-icu.patch.0 \ external/libxml2/ubsan.patch.0 \ + external/libxml2/libxml2-iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxml2/libxml2-iOS.patch.0 b/external/libxml2/libxml2-iOS.patch.0 new file mode 100644 index 000000000000..72d35441e255 --- /dev/null +++ b/external/libxml2/libxml2-iOS.patch.0 @@ -0,0 +1,21 @@ +diff -ur libxml2.org/config.sub libxml2/config.sub +--- config.sub 2017-06-11 08:01:59.000000000 +0200 ++++ config.sub 2017-06-11 08:03:06.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 \ +@@ -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-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
