README.md | 2 +- configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 7729d6339552fd48e75bf92ebee8742ff91e2e82 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Wed Jan 8 21:56:11 2025 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue May 27 14:12:33 2025 +0200 bump minimum Xcode version to 14.3 (and that in turn requries macOS 13) The old Xcode version just doesn't support newer c++ features like std::ranges and similar that some externals and now also some parts in core start using. We don't have any CI bots building on that old platform anymore, and bumping the build-requirement doesn't affect the runtime requirements. So instead of stacking on workaround after workaround for an OS that already reached EOL, just drop support for building on it. (see also https://developer.apple.com/xcode/cpp/ ) Change-Id: I340180f32c195547a1f93d271e5bbc59252198e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185895 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/README.md b/README.md index 756d02b5d00f..3f8a4a3567d7 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 2019 version 16.10 * macOS: * Runtime: 10.15 (11 for aarch64) - * Build: 12 + Xcode 14.2 or later (using latest version available for a given version of macOS) + * Build: 13 or later + Xcode 14.3 or later (using latest version available for a given version of macOS) * Linux: * Runtime: RHEL 8 or CentOS 8 and comparable * Build: either GCC 12; or Clang 12 with libstdc++ 10 diff --git a/configure.ac b/configure.ac index f415494ceeda..d86e8f74c8b3 100644 --- a/configure.ac +++ b/configure.ac @@ -3740,8 +3740,8 @@ if test $_os = Darwin; then MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print $1*10000+$2*100+$3 }') # we require Xcode 14.2 or later, and thus macOS SDK 13.1 or later/older versions might work # but are untested - if test $MACOSX_SDK_VERSION -lt 130100; then - AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported version is 13.1]) + if test $MACOSX_SDK_VERSION -lt 130300; then + AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported version is 13.3]) fi AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH]) @@ -3778,7 +3778,7 @@ 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 1402; then + if test "$my_xcode_ver3" -ge 1403; then AC_MSG_RESULT([yes ($my_xcode_ver2)]) if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 120000; then if test "$my_xcode_ver3" -eq 1500; then @@ -3790,7 +3790,7 @@ if test $_os = Darwin; then fi fi else - AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 14.2]) + AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 14.3]) fi my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)