[Libreoffice-commits] core.git: 2 commits - configure.ac ios/CustomTarget_iOS.mk ios/LibreOfficeKit ios/loApp.xcconfig.in ios/loKit.xcconfig.in

[jan Iversen]

 configure.ac                                                |    4 +-
 ios/CustomTarget_iOS.mk                                     |    2 -
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj |   22 ++++++------
 ios/loApp.xcconfig.in                                       |    1 
 ios/loKit.xcconfig.in                                       |    1 
 5 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 20db1be102731059e43ec5b3c2ae80039621f887
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue Oct 3 22:13:18 2017 +0200

    iOS, bump SDK version to 10.3
    
    10.3 is needed (anyhow 11.0 is on the street)
    
    Change-Id: Ic9afed3ecbb76e71eb0ee0fc74f4b64dc38af716

diff --git a/configure.ac b/configure.ac
index 3b02041874b4..8c12f1301046 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2871,12 +2871,12 @@ if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
-        versionmin=-mios-simulator-version-min=9.3
+        versionmin=-mios-simulator-version-min=10.3
         IOS_ARCH=x86_64
         BITNESS=-fembed-bitcode
     else
         platform=iPhoneOS
-        versionmin=-miphoneos-version-min=9.3
+        versionmin=-miphoneos-version-min=10.3
         IOS_ARCH=arm64
         BITNESS=-fembed-bitcode
     fi
commit eb957c16904717201536f289063de63f1653dbf9
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue Oct 3 22:06:34 2017 +0200

    iOS, get rid of OSX - iOS link conflict.
    
    Prelinking uses special flags, adjusted.
    
    Change-Id: Ie9537df3a158818128ee0c4e08b3ad0a782009fb

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index a05194b7d318..d765ca2426f6 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -36,7 +36,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	    -e "s'@WORKDIR@'$(WORKDIR)'g" \
 	    -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
 	    -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
 	    -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
 	    -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
 	    $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig
@@ -46,7 +45,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	    -e "s'@WORKDIR@'$(WORKDIR)'g" \
 	    -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
 	    -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
 	    -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
 	    $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
 
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 918920baeee5..407b57cb37d5 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -198,12 +198,11 @@
 					"$(LO_SRCDIR)/ios/generated",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_GENERATE_MAP_FILE = YES;
+				LD_MAP_FILE_PATH = ./iosKit.map;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"$(LINK_LDFLAGS)",
-					"-lstdc++",
-				);
+				PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "x86_64 arm64";
 			};
@@ -261,12 +260,11 @@
 					"$(LO_SRCDIR)/ios/generated",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_GENERATE_MAP_FILE = YES;
+				LD_MAP_FILE_PATH = ./iosKit.map;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"$(LINK_LDFLAGS)",
-					"-lstdc++",
-				);
+				PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = "x86_64 arm64";
@@ -276,7 +274,9 @@
 		39B5D21F1F78130F008FB162 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "";
+				PRELINK_FLAGS = "-ios_version_min 9.3";
+				PRELINK_LIBS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -285,7 +285,9 @@
 		39B5D2201F78130F008FB162 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = "";
+				PRELINK_FLAGS = "-ios_version_min 9.3";
+				PRELINK_LIBS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index c7fae301374c..dba31a09691d 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -12,6 +12,5 @@ LO_SRCDIR = @SRCDIR@
 LO_WORKDIR = @WORKDIR@
 OTHER_CFLAGS = @CFLAGS@
 OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
-LINK_LDFLAGS = @LDFLAGS@
 SYMROOT = @SYMROOT@
 
diff --git a/ios/loKit.xcconfig.in b/ios/loKit.xcconfig.in
index 8b1e62f230db..1a00e5747257 100644
--- a/ios/loKit.xcconfig.in
+++ b/ios/loKit.xcconfig.in
@@ -12,7 +12,6 @@ LO_SRCDIR = @SRCDIR@
 LO_WORKDIR = @WORKDIR@
 OTHER_CFLAGS = @CFLAGS@
 OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
-LINK_LDFLAGS = @LDFLAGS@
 SYMROOT = @SYMROOT@
 
 PRELINK_LIBS = @PRELINK@