summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-09-19 15:30:10 +0200
committerjan Iversen <jani@libreoffice.org>2017-09-19 15:39:32 +0200
commitbc6aa1c4c3304baaaec4c9e14d47b983d186550b (patch)
treed5df94bb51c363ae6396dae7f6823b8d2a467e08 /external
parenta706590e8e7cd048e3117bc9a5ff7677fd5ab490 (diff)
iOS, patch libcdr to accept 64bit compile
Change-Id: Ifa52ee6caedbf79450b098a3a0debe75836debb8
Diffstat (limited to 'external')
-rw-r--r--external/libcdr/UnpackedTarball_libcdr.mk3
-rw-r--r--external/libcdr/iOS.patch20
2 files changed, 23 insertions, 0 deletions
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index e3c218386f50..cc3851ebdccb 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -13,6 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+ external/libcdr/iOS.patch \
+))
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
diff --git a/external/libcdr/iOS.patch b/external/libcdr/iOS.patch
new file mode 100644
index 000000000000..44e3d87918f6
--- /dev/null
+++ b/external/libcdr/iOS.patch
@@ -0,0 +1,20 @@
+--- config.sub
++++ config.sub
+@@ -250,7 +250,7 @@
+ | 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 \
+@@ -358,7 +358,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-* \