[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - config_host.mk.in configure.ac

[Libreoffice Gerrit user]

 config_host.mk.in |    2 --
 configure.ac      |   22 ++++++----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit fdfe900d7150d535c34efb04e087d2f5ecf824cf
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 4 20:45:59 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jan 4 20:48:57 2019 +0000

    Re-introduce the functionality to look for multiple iOS SDK versions
    
    Currently, look for 12.1, 12.0, 11.4 and 11.2. (But of course I recommend
    people keep their Xcode updated, and thus now build against the 12.1
    SDK.)
    
    Also get rid of two AC_SUBST variables that were not used anywhere.
    
    Change-Id: Ic1abf3eb1d900c843263dc781fd4c9a8ab126f09
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index dcf044d4ea12..802b8e45d353 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -623,8 +623,6 @@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
 export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
-export IOS_SDK=@IOS_SDK@
-export IOS_DEPLOYMENT_VERSION=@IOS_DEPLOYMENT_VERSION@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XMLSEC_CFLAGS=$(gb_SPACE)@XMLSEC_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 81fada168e9d..ef9fcb4cf5d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2862,38 +2862,31 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdks_ver="12.1 11.2"
+    current_sdk_ver=12.1
+    older_sdk_vers="12.0 11.4 11.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
+        versionmin=-mios-simulator-version-min=11.0
     else
         platform=iPhoneOS
+        versionmin=-miphoneos-version-min=11.0
     fi
     xcode_developer=`xcode-select -print-path`
 
-    for sdkver in $current_sdks_ver; do
+    for sdkver in $current_sdk_ver $older_sdk_vers; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
-            ios_sdk=$sdkver
             sysroot=$t
             break
         fi
     done
 
-    if test "$enable_ios_simulator" = "yes"; then
-        versionmin=-mios-simulator-version-min=$ios_sdk
-    else
-        versionmin=-miphoneos-version-min=11.0
-    fi
-
     if test -z "$sysroot"; then
-        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}(${current_sdks_ver}).sdk])
+        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}.sdk])
     fi
 
     AC_MSG_RESULT($sysroot)
 
-    IOS_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
-    IOS_DEPLOYMENT_VERSION=$ios_sdk
-
     # LTO is not really recommended for iOS builds,
     # the link time will be astronomical
     if test "$ENABLE_LTO" = TRUE; then
@@ -2913,9 +2906,6 @@ if test $_os = iOS; then
     RANLIB=`xcrun -find ranlib`
 fi
 
-AC_SUBST(IOS_SDK)
-AC_SUBST(IOS_DEPLOYMENT_VERSION)
-
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
 if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = TRUE \) -o \