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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Feb 20 20:20:06 UTC 2020


 README.md    |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 358146bbbd1b9775c12770fb5e497b6ec5adfc51
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 20 18:12:51 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Feb 20 21:19:26 2020 +0100

    Bump macOS build baseline to Xcode 11.3 and macOS 10.14.4
    
    ...as discussed at
    <https://lists.freedesktop.org/archives/libreoffice/2020-February/084471.html>
    "Bump macOS Xcode baseline to 11?" and
    <https://lists.freedesktop.org/archives/libreoffice/2020-February/084519.html>
    "ESC meeting minutes: 2020-02-20".
    
    (Code that might no longer be relevant will be cleaned up in follow-up commits.)
    
    Change-Id: I179e6099937d244502bd0e7fbff43f1734984213
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89154
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/README.md b/README.md
index 2f56b8fdde93..87de8f4baee4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ run and compile LibreOffice, also used by the TDF builds:
     * Build: Cygwin + Visual Studio 2017 version 15.7
 * macOS:
     * Runtime: 10.10
-    * Build: 10.13.2 + Xcode 9.3
+    * Build: 10.14.4 + Xcode 11.3
 * Linux:
     * Runtime: RHEL 7 or CentOS 7
     * Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0
diff --git a/configure.ac b/configure.ac
index 0b728af2e5fb..77e4619f5022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2858,10 +2858,10 @@ if test $_os = Darwin; then
     my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
     my_xcode_ver2=${my_xcode_ver1#Xcode }
     my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print $1*100+($2<100?$2:99) }')
-    if test "$my_xcode_ver3" -ge 903; then
+    if test "$my_xcode_ver3" -ge 1103; then
         AC_MSG_RESULT([yes ($my_xcode_ver2)])
     else
-        AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 9.3])
+        AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 11.3])
     fi
 
     case "$with_macosx_version_min_required" in


More information about the Libreoffice-commits mailing list