mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump minimum macOS to 10.14

Browse Source 
This gives us full support for variant, optional, any and visit libraries

Change-Id: I9f1bff5d7c0e2d5acc8c8b92c9a269b00e317574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135804
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
Ilmari Lauhakangas
2022-06-14 11:22:13 +03:00
parent cb83063cc0
commit 0c96561a56
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -38,7 +38,7 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: Windows 7 * Runtime: Windows 7
* Build: Cygwin + Visual Studio 2019 version 16.10 * Build: Cygwin + Visual Studio 2019 version 16.10
* macOS: * macOS:
* Runtime: 10.13 * Runtime: 10.14
* Build: 11.0 + Xcode 12.5 * Build: 11.0 + Xcode 12.5
* Linux: * Linux:
* Runtime: RHEL 7 or CentOS 7 * Runtime: RHEL 7 or CentOS 7

9
configure.ac
View File

@@ -2845,7 +2845,7 @@ AC_ARG_WITH(macosx-version-min-required,
AS_HELP_STRING([--with-macosx-version-min-required=<version>], AS_HELP_STRING([--with-macosx-version-min-required=<version>],
[set the minimum OS version needed to run the built LibreOffice]) [set the minimum OS version needed to run the built LibreOffice])
[ [
e. g.: --with-macosx-version-min-required=10.13 e. g.: --with-macosx-version-min-required=10.14
], ],
,) ,)
@@ -3446,7 +3446,7 @@ if test $_os = Darwin; then
if test "$with_macosx_version_min_required" = "" ; then if test "$with_macosx_version_min_required" = "" ; then
if test "$host_cpu" = x86_64; then if test "$host_cpu" = x86_64; then
with_macosx_version_min_required="10.13"; with_macosx_version_min_required="10.14";
else else
with_macosx_version_min_required="11.0"; with_macosx_version_min_required="11.0";
fi fi
@@ -3470,9 +3470,6 @@ if test $_os = Darwin; then
fi fi
case "$with_macosx_version_min_required" in case "$with_macosx_version_min_required" in
10.13)
MAC_OS_X_VERSION_MIN_REQUIRED="101300"
;;
10.14) 10.14)
MAC_OS_X_VERSION_MIN_REQUIRED="101400" MAC_OS_X_VERSION_MIN_REQUIRED="101400"
;; ;;
@@ -3501,7 +3498,7 @@ if test $_os = Darwin; then
MAC_OS_X_VERSION_MIN_REQUIRED="120300" MAC_OS_X_VERSION_MIN_REQUIRED="120300"
;; ;;
*) *)
AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.13--12.3]) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.14--12.3])
;; ;;
esac esac