iOS, added IOS_DEPLOYMENT_VERSION

Desktop / LibreOffice - jan Iversen [libreoffice.org] - 24 November 2017 08:10 EST



###

diff --git a/config_host.mk.in b/config_host.mk.in
index 4ea5595baaaf..0b9528fa6569 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -622,6 +622,7 @@ 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 8e0822caac64..5e50660f7aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2845,17 +2845,17 @@ dnl ===================================================================

if test $_os = iOS; then
AC_MSG_CHECKING([what iOS SDK to use])
+ current_sdk_ver=11.1
if test "$enable_ios_simulator" = "yes"; then
platform=iPhoneSimulator
- versionmin=-mios-simulator-version-min=11.1
+ versionmin=-mios-simulator-version-min=$current_sdk_ver
else
platform=iPhoneOS
- versionmin=-miphoneos-version-min=11.1
+ versionmin=-miphoneos-version-min=$current_sdk_ver
fi
xcode_developer=`xcode-select -print-path`

- current_sdk_ver=11.1
- for sdkver in 11.1; do
+ for sdkver in $current_sdk_ver; do
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
if test -d $t; then
ios_sdk=$sdkver
@@ -2871,6 +2871,7 @@ if test $_os = iOS; then
AC_MSG_RESULT($sysroot)

IOS_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
+ IOS_DEPLOYMENT_VERSION=$current_sdk_ver

# LTO is not really recommended for iOS builds,
# the link time will be astronomical
@@ -2892,6 +2893,7 @@ if test $_os = iOS; then
fi

AC_SUBST(IOS_SDK)
+AC_SUBST(IOS_DEPLOYMENT_VERSION)

AC_MSG_CHECKING([whether to treat the installation as read-only])

99534540df14 iOS, added IOS_DEPLOYMENT_VERSION
config_host.mk.in | 1 +
configure.ac | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)

Upstream: cgit.freedesktop.org


  • Share