bin/lo-all-static-libs | 16 +++++----
configure.ac | 2 -
external/libxslt/UnpackedTarball_libxslt.mk | 1
external/libxslt/iOS.patch.0 | 20 ++++++++++++
ios/CustomTarget_iOS.mk | 2 -
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 2 -
solenv/gbuild/config.sub | 4 +-
7 files changed, 34 insertions(+), 13 deletions(-)
New commits:
commit eed96773b4adf7fdec74502ee89bca63b9018a80
Author: jan Iversen <j...@libreoffice.org>
Date: Fri Oct 6 09:20:22 2017 +0200
iOS, fixes for release build
removed coinmp (needed to update lo-all-static-libs)
convert CPUNAME to lowercase (needed by xcodebuild)
Change-Id: I13ccfbd6a6fd139db2745c1536192710afe094bb
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 310c432fc0a6..97c5508c741d 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -46,6 +46,15 @@ ANDROID)
# Only liblo-bootstrap.a ends up here:
oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a"
+
+ # coinmp not used for iOS
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a"
+ oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a"
;;
IOS)
oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
@@ -59,13 +68,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$foolibs \
$WORKDIR/LinkTarget/StaticLibrary/lib*.a \
$oslibs \
- $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
$WORKDIR/UnpackedTarball/icu/source/lib/*.a \
$WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
$WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 55375687ff0e..f3e834f5084f 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -116,7 +116,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj
$(IOSKITXC) $(IOSAPPXC)
-project $(IOSKITPRJ) \
-target LibreOfficeKit \
-sdk $(IOS_SDK) \
- -arch $(CPU_NAME) \
+ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'`\
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
build \
, $(WORKDIR)/ios/build.log \
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 407b57cb37d5..ca9a90549414 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -25,7 +25,6 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 3908315E1F8395EB003F2A29 /* loKit.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loKit.xcconfig; path =
../../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree =
"<group>"; };
39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa =
PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path =
libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h;
sourceTree = "<group>"; };
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path =
LibreOfficeKit.mm; sourceTree = "<group>"; };
@@ -69,7 +68,6 @@
39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
isa = PBXGroup;
children = (
- 3908315E1F8395EB003F2A29 /* loKit.xcconfig */,
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm
*/,
);
commit 60e7480535147bbfb1b000528510e66303c032fb
Author: jan Iversen <j...@libreoffice.org>
Date: Thu Oct 5 17:07:14 2017 +0200
iOS, third party library update
added arm64 to config.sub
removed coinmp from compilation
Change-Id: Ib0a4d8fc7cae399183116e928485869a08e7b1af
diff --git a/configure.ac b/configure.ac
index 057c5ef2db26..396d02b88296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -630,7 +630,7 @@ darwin*) # Mac OS X or iOS
test_cups=no
enable_mpl_subset=yes
enable_lotuswordpro=no
- enable_coinmp=yes
+ enable_coinmp=no
enable_lpsolve=no
enable_postgresql_sdbc=no
enable_extension_integration=no
diff --git a/external/libxslt/UnpackedTarball_libxslt.mk
b/external/libxslt/UnpackedTarball_libxslt.mk
index eae318ef74b9..27be0ca3dccb 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+ external/libxslt/iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/iOS.patch.0 b/external/libxslt/iOS.patch.0
new file mode 100644
index 000000000000..ffd4a39a815a
--- /dev/null
+++ b/external/libxslt/iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub
++++ config.sub
+@@ -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 --git a/solenv/gbuild/config.sub b/solenv/gbuild/config.sub
index 932128b337ee..d85ddaa5ae33 100755
--- a/solenv/gbuild/config.sub
+++ b/solenv/gbuild/config.sub
@@ -252,7 +252,7 @@ case $basic_machine in
| 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 \
@@ -376,7 +376,7 @@ case $basic_machine in
| 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-* \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
