README.md | 4 ++--
configure.ac | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 6c5f0a41331abb2041394ac19c6653aec4ad0899
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Jan 8 21:56:11 2025 +0100
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Mar 20 11:19:58 2025 +0100
require Xcode version >= 14.2 (and in turn macOS 12) to build
that was already our documented baseline, but configure still accepted
older versions of the macOS SDK/older versions of Xcode.
Xcode 14.2 is the last version available for macOS 12 and it comes with
macOS SDK 13.1, so we can also require/check for that in configure.
After f4bd60261e6b8c1f7aa273bf985fa597c4e6e6dd
"Refactor comparison operators for DateTime and Time classes"
building with SDK 12.1 fails with
In file included from
/Users/libreoffice/lode/bibisect/core258/tools/source/datetime/datetime.cxx:19:
/Users/libreoffice/lode/bibisect/core258/include/tools/datetime.hxx:74:69:
error: invalid operands to binary expression ('pair<typename
__unwrap_ref_decay<int>::type, typename __unwrap_ref_decay<long>::type>' (aka
'pair<int, long>') and 'pair<typename __unwrap_ref_decay<int>::type, typename
__unwrap_ref_decay<long>::type>')
return std::make_pair(GetDate(), GetTime()) <=>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
Change-Id: I340180f32c195547a1f93d271e5bbc59252198e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179972
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/README.md b/README.md
index f1ec093287fa..756d02b5d00f 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: Windows 10
* Build: Cygwin + Visual Studio 2019 version 16.10
* macOS:
- * Runtime: 10.15
- * Build: 12 (13 for aarch64) + Xcode 14
+ * Runtime: 10.15 (11 for aarch64)
+ * Build: 12 + Xcode 14.2 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 46efc6456061..d35b53fabe9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3681,11 +3681,10 @@ if test $_os = Darwin; then
# we don't target the lower versions anymore, so it doesn't matter that we
don't generate the
# correct version in case such an old SDK is specified, it will be
rejected later anyway
MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print
$1*10000+$2*100+$3 }')
- if test $MACOSX_SDK_VERSION -lt 101500; then
- AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported
version is 10.15])
- fi
- if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 110000; then
- AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple Silicon
(need at least 11.0)])
+ # 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])
fi
AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
@@ -3722,7 +3721,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 1205; then
+ if test "$my_xcode_ver3" -ge 1402; 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
@@ -3734,7 +3733,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 12.5])
+ AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 14.2])
fi
my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
