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

Bump minimum macOS to 10.12

Browse Source 
Change-Id: I1a4af1af2eb95cb182491b2de2ac05dc3a1cb0c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124547
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
Tor Lillqvist
2021-11-01 14:46:08 +02:00
committed by Ilmari Lauhakangas
parent 65081542d2
commit 0f1155503e
2 changed files with 11 additions and 23 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.5 * Build: Cygwin + Visual Studio 2019 version 16.5
* macOS: * macOS:
* Runtime: 10.10 * Runtime: 10.12
* Build: 10.14.4 + Xcode 11.3 * Build: 10.14.4 + Xcode 11.3
* Linux: * Linux:
* Runtime: RHEL 7 or CentOS 7 * Runtime: RHEL 7 or CentOS 7

32
configure.ac
View File

@@ -2783,7 +2783,7 @@ AC_ARG_WITH(macosx-sdk,
not terribly useful. It works fine to build with a new SDK and run the result not terribly useful. It works fine to build with a new SDK and run the result
on an older OS. on an older OS.
e. g.: --with-macosx-sdk=10.10 e. g.: --with-macosx-sdk=10.15
there are 3 options to control the MacOSX build: there are 3 options to control the MacOSX build:
--with-macosx-sdk (referred as 'sdk' below) --with-macosx-sdk (referred as 'sdk' below)
@@ -2798,10 +2798,10 @@ AC_ARG_WITH(macosx-sdk,
command line || config result command line || config result
========================================== ==========================================
min | max | sdk || min | max | sdk | min | max | sdk || min | max | sdk |
? | ? | ? || 10.10 | 10.s | 10.s | ? | ? | ? || 10.12 | 10.s | 10.s |
? | ? | 10.x || 10.10 | 10.x | 10.x | ? | ? | 10.x || 10.12 | 10.x | 10.x |
? | 10.x | ? || 10.10 | 10.s | 10.s | ? | 10.x | ? || 10.12 | 10.s | 10.s |
? | 10.x | 10.y || 10.10 | 10.x | 10.y | ? | 10.x | 10.y || 10.12 | 10.x | 10.y |
10.x | ? | ? || 10.x | 10.s | 10.s | 10.x | ? | ? || 10.x | 10.s | 10.s |
10.x | ? | 10.y || 10.x | 10.y | 10.y | 10.x | ? | 10.y || 10.x | 10.y | 10.y |
10.x | 10.y | ? || 10.x | 10.y | 10.y | 10.x | 10.y | ? || 10.x | 10.y | 10.y |
@@ -2819,7 +2819,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.10 e. g.: --with-macosx-version-min-required=10.12
see --with-macosx-sdk for more info see --with-macosx-sdk for more info
], ],
,) ,)
@@ -2828,7 +2828,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
AS_HELP_STRING([--with-macosx-version-max-allowed=<version>], AS_HELP_STRING([--with-macosx-version-max-allowed=<version>],
[set the maximum allowed OS version the LibreOffice compilation can use APIs from]) [set the maximum allowed OS version the LibreOffice compilation can use APIs from])
[ [
e. g.: --with-macosx-version-max-allowed=10.10 e. g.: --with-macosx-version-max-allowed=10.12
see --with-macosx-sdk for more info see --with-macosx-sdk for more info
], ],
,) ,)
@@ -3303,7 +3303,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.10"; with_macosx_version_min_required="10.12";
else else
with_macosx_version_min_required="11.0"; with_macosx_version_min_required="11.0";
fi fi
@@ -3331,12 +3331,6 @@ if test $_os = Darwin; then
fi fi
case "$with_macosx_version_min_required" in case "$with_macosx_version_min_required" in
10.10)
MAC_OS_X_VERSION_MIN_REQUIRED="101000"
;;
10.11)
MAC_OS_X_VERSION_MIN_REQUIRED="101100"
;;
10.12) 10.12)
MAC_OS_X_VERSION_MIN_REQUIRED="101200" MAC_OS_X_VERSION_MIN_REQUIRED="101200"
;; ;;
@@ -3365,7 +3359,7 @@ if test $_os = Darwin; then
MAC_OS_X_VERSION_MIN_REQUIRED="120000" MAC_OS_X_VERSION_MIN_REQUIRED="120000"
;; ;;
*) *)
AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--12.0]) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.12--12.0])
;; ;;
esac esac
@@ -3405,12 +3399,6 @@ if test $_os = Darwin; then
fi fi
case "$with_macosx_version_max_allowed" in case "$with_macosx_version_max_allowed" in
10.10)
MAC_OS_X_VERSION_MAX_ALLOWED="101000"
;;
10.11)
MAC_OS_X_VERSION_MAX_ALLOWED="101100"
;;
10.12) 10.12)
MAC_OS_X_VERSION_MAX_ALLOWED="101200" MAC_OS_X_VERSION_MAX_ALLOWED="101200"
;; ;;
@@ -3436,7 +3424,7 @@ if test $_os = Darwin; then
MAC_OS_X_VERSION_MAX_ALLOWED="120000" MAC_OS_X_VERSION_MAX_ALLOWED="120000"
;; ;;
*) *)
AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--12.0]) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.12--12.0])
;; ;;
esac esac