configure.ac | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 55dda2def5d00f94b1d34008df177b870263cac3
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Apr 27 11:38:38 2021 +0300
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Apr 28 15:14:40 2021 +0200
Accept macOS SDK 11.3
Change-Id: I210ae30e51d796990f88340da8b29f4c7080f5d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114702
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit bc35e5fe5922a71749c65a9b2d0412e4a3f34128)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114721
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 1ebad5db21dd..ce77ba849516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3131,7 +3131,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-11.1 11.0 10.15 10.14 10.13}; do
+ for _macosx_sdk in ${with_macosx_sdk-11.3 11.1 11.0 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}"
@@ -3166,8 +3166,11 @@ if test $_os = Darwin; then
11.1)
MACOSX_SDK_VERSION=110100
;;
+ 11.3)
+ MACOSX_SDK_VERSION=110300
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--11.1])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--11.3])
;;
esac
@@ -3232,8 +3235,11 @@ if test $_os = Darwin; then
11.1)
MAC_OS_X_VERSION_MIN_REQUIRED="110100"
;;
+ 11.3)
+ MAC_OS_X_VERSION_MIN_REQUIRED="110300"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--11.1])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--11.3])
;;
esac
@@ -3297,8 +3303,11 @@ if test $_os = Darwin; then
11.1)
MAC_OS_X_VERSION_MAX_ALLOWED="110100"
;;
+ 11.3)
+ MAC_OS_X_VERSION_MAX_ALLOWED="110300"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--11.1])
+ AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--11.3])
;;
esac
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
