From 2a365cd2739285db8a2178531c289438f51270a7 Mon Sep 17 00:00:00 2001
From: jan Iversen <jani@libreoffice.org>
Date: Tue, 13 Jun 2017 10:10:07 +0200
Subject: iOS, patch redland

Support for arm64

Change-Id: Id9f89452174bac4acb8d5b7dd3e23d91c2b2acf1
---
 external/redland/UnpackedTarball_raptor.mk   |  1 +
 external/redland/UnpackedTarball_rasqal.mk   |  1 +
 external/redland/UnpackedTarball_redland.mk  |  2 ++
 external/redland/raptor/iOS.patch.0          | 21 +++++++++++++++++++++
 external/redland/rasqal/iOS.patch.0          | 21 +++++++++++++++++++++
 external/redland/redland/iOS-libltdl.patch.0 | 21 +++++++++++++++++++++
 external/redland/redland/iOS.patch.0         | 21 +++++++++++++++++++++
 7 files changed, 88 insertions(+)
 create mode 100644 external/redland/raptor/iOS.patch.0
 create mode 100644 external/redland/rasqal/iOS.patch.0
 create mode 100644 external/redland/redland/iOS-libltdl.patch.0
 create mode 100644 external/redland/redland/iOS.patch.0

(limited to 'external')

diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index 6c4a0bc41780..daf4e0c64bca 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
 	external/redland/raptor/xml2-config.patch \
 	external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \
 	external/redland/raptor/libtool.patch \
+	external/redland/raptor/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
index 7ec66128733f..5bd7fb803dc7 100644
--- a/external/redland/UnpackedTarball_rasqal.mk
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
 	external/redland/rasqal/rpath.patch \
 	external/redland/rasqal/clang-cl.patch \
 	external/redland/rasqal/libtool.patch \
+	external/redland/rasqal/iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
index 657bf484153d..8a4e8f4617dc 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
 	external/redland/redland/rpath.patch \
 	external/redland/redland/clang-cl.patch \
 	external/redland/redland/libtool.patch \
+	external/redland/redland/iOS.patch.0 \
+	external/redland/redland/iOS-libltdl.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/iOS.patch.0 b/external/redland/raptor/iOS.patch.0
new file mode 100644
index 000000000000..ecd51db1b720
--- /dev/null
+++ b/external/redland/raptor/iOS.patch.0
@@ -0,0 +1,21 @@
+--- build/config.sub	2014-11-02 07:04:37.000000000 +0100
++++ build/config.sub	2017-06-13 09:17:33.000000000 +0200
+@@ -259,7 +259,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 \
+@@ -371,7 +372,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-* \
diff --git a/external/redland/rasqal/iOS.patch.0 b/external/redland/rasqal/iOS.patch.0
new file mode 100644
index 000000000000..5d34175ef9cf
--- /dev/null
+++ b/external/redland/rasqal/iOS.patch.0
@@ -0,0 +1,21 @@
+--- build/config.sub	2014-03-17 03:39:35.000000000 +0100
++++ build/config.sub	2017-06-13 09:44:04.000000000 +0200
+@@ -259,7 +259,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 \
+@@ -371,7 +372,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-* \
diff --git a/external/redland/redland/iOS-libltdl.patch.0 b/external/redland/redland/iOS-libltdl.patch.0
new file mode 100644
index 000000000000..6f26d591ace0
--- /dev/null
+++ b/external/redland/redland/iOS-libltdl.patch.0
@@ -0,0 +1,21 @@
+--- libltdl/config/config.sub	2013-06-09 22:45:46.000000000 +0200
++++ libltdl/config/config.sub	2017-06-13 10:05:41.000000000 +0200
+@@ -259,7 +259,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 \
+@@ -371,7 +372,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-* \
diff --git a/external/redland/redland/iOS.patch.0 b/external/redland/redland/iOS.patch.0
new file mode 100644
index 000000000000..facaa0c0ee77
--- /dev/null
+++ b/external/redland/redland/iOS.patch.0
@@ -0,0 +1,21 @@
+--- build/config.sub	2013-06-09 22:45:51.000000000 +0200
++++ build/config.sub	2017-06-13 09:48:08.000000000 +0200
+@@ -259,7 +259,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 \
+@@ -371,7 +372,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