[Libreoffice-commits] core.git: configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6fbe751aeed93153da8fc6c2da99d345b4659737
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Jan 4 14:24:02 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Feb 12 10:52:53 2020 +0100

    Drop macOS SDK 10.12 baseline
    
    ...which appears to no longer work due to incompatible changes incorporated in
    LO code already.  sberg says: "The first issue I encountered when building
    against the 10.12 SDK is 'fpicker/source/aqua/ControlHelper.hxx:119:78: error:
    use of undeclared identifier 'NSControlStateValueOn''."
    
    Change-Id: Ib762dd8eaa355925b9a81fb41b550c49bfcf53da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86216
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 4713f269ccbf..60f8d25611cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2803,7 +2803,7 @@ if test $_os = Darwin; then
     # higher than or equal to the minimum required should be found.
 
     AC_MSG_CHECKING([what macOS SDK to use])
-    for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
+    for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13}; do
         MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
         if test -d "$MACOSX_SDK_PATH"; then
             with_macosx_sdk="${_macosx_sdk}"
@@ -2823,9 +2823,6 @@ if test $_os = Darwin; then
     AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
 
     case $with_macosx_sdk in
-    10.12)
-        MACOSX_SDK_VERSION=101200
-        ;;
     10.13)
         MACOSX_SDK_VERSION=101300
         ;;
@@ -2836,7 +2833,7 @@ if test $_os = Darwin; then
         MACOSX_SDK_VERSION=101500
         ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--15])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--15])
         ;;
     esac