[Libreoffice-commits] core.git: external/coinmp
jan Iversen
jani at libreoffice.org
Wed Sep 6 15:44:55 UTC 2017
external/coinmp/UnpackedTarball_coinmp.mk | 1
external/coinmp/iOS.patch.1 | 189 ++++++++++++++++++++++++++++++
2 files changed, 190 insertions(+)
New commits:
commit ac38af2bb850abab0039d7c9e35644752cf4feb1
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Sep 6 17:42:37 2017 +0200
corrected commit 397e2f0cfb310ac606705c74e5907195e5ca7872
that commit removed all iOS patches for CoinMP, they are
still needed.
Updated the iOS.patch.1 to the patches config.sub(s)
Change-Id: Id69b436c85d5f3b7113522404f47872559896dd6
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index b36d328e239b..865c0f2b43e4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
external/coinmp/automake.patch \
+ external/coinmp/iOS.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
new file mode 100644
index 000000000000..3a34a89a1c66
--- /dev/null
+++ b/external/coinmp/iOS.patch.1
@@ -0,0 +1,189 @@
+diff -Naur coinmp/BuildTools/config.sub coinmp_new/BuildTools/config.sub
+--- coinmp/BuildTools/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/BuildTools/config.sub 2017-09-06 17:37:36.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-* \
+diff -Naur coinmp/Cbc/config.sub coinmp_new/Cbc/config.sub
+--- coinmp/Cbc/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/Cbc/config.sub 2017-09-06 17:38:09.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-* \
+diff -Naur coinmp/Cgl/config.sub coinmp_new/Cgl/config.sub
+--- coinmp/Cgl/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/Cgl/config.sub 2017-09-06 17:38:32.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-* \
+diff -Naur coinmp/Clp/config.sub coinmp_new/Clp/config.sub
+--- coinmp/Clp/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/Clp/config.sub 2017-09-06 17:38:54.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-* \
+diff -Naur coinmp/CoinMP/config.sub coinmp_new/CoinMP/config.sub
+--- coinmp/CoinMP/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/CoinMP/config.sub 2017-09-06 17:39:21.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-* \
+diff -Naur coinmp/CoinUtils/config.sub coinmp_new/CoinUtils/config.sub
+--- coinmp/CoinUtils/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/CoinUtils/config.sub 2017-09-06 17:39:43.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-* \
+diff -Naur coinmp/Data/Sample/config.sub coinmp_new/Data/Sample/config.sub
+--- coinmp/Data/Sample/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/Data/Sample/config.sub 2017-09-06 17:40:21.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-* \
+diff -Naur coinmp/Osi/config.sub coinmp_new/Osi/config.sub
+--- coinmp/Osi/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/Osi/config.sub 2017-09-06 17:40:38.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-* \
+diff -Naur coinmp/config.sub coinmp_new/config.sub
+--- coinmp/config.sub 2017-09-06 17:32:53.000000000 +0200
++++ coinmp_new/config.sub 2017-09-06 17:40:02.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-* \
More information about the Libreoffice-commits
mailing list