configure.ac | 46 +++++++++++++---------------------------------
1 file changed, 13 insertions(+), 33 deletions(-)
New commits:
commit d0548cc49d20910e222a4fe84ebc48b8786a127d
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 19 07:07:27 2017 -0500
bumb MacOS baseline to 10.9
we desire libxml 2.8+ and as a side effect that also provide
thread-safe static in c++
(cherry picked from commit 7dcee9790c18a594236dc32a534c20f1e7447ee6)
Change-Id: I2a0f06a81c6a5734a8b3a859fb291e5ae80d12e9
Reviewed-on: https://gerrit.libreoffice.org/38028
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/configure.ac b/configure.ac
index 35497b23cb58..b38623879abd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2329,7 +2329,7 @@ AC_ARG_WITH(macosx-sdk,
not terribly useful. It works fine to build with a
new SDK and run the result
on an older OS.
- e. g.: --with-macosx-sdk=10.8
+ e. g.: --with-macosx-sdk=10.9
there are 3 options to control the MacOSX build:
--with-macosx-sdk (referred as 'sdk' below)
@@ -2344,10 +2344,10 @@ AC_ARG_WITH(macosx-sdk,
command line || config result
==========================================
min | max | sdk || min | max | sdk |
- ? | ? | ? || 10.8 | 10.s | 10.s |
- ? | ? | 10.x || 10.8 | 10.x | 10.x |
- ? | 10.x | ? || 10.8 | 10.s | 10.s |
- ? | 10.x | 10.y || 10.8 | 10.x | 10.y |
+ ? | ? | ? || 10.9 | 10.s | 10.s |
+ ? | ? | 10.x || 10.9 | 10.x | 10.x |
+ ? | 10.x | ? || 10.9 | 10.s | 10.s |
+ ? | 10.x | 10.y || 10.9 | 10.x | 10.y |
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 |
@@ -2365,7 +2365,7 @@ AC_ARG_WITH(macosx-version-min-required,
AS_HELP_STRING([--with-macosx-version-min-required=<version>],
[set the minimum OS version needed to run the built LibreOffice])
[
- e. g.: --with-macos-version-min-required=10.8
+ e. g.: --with-macos-version-min-required=10.9
see --with-macosx-sdk for more info
],
,)
@@ -2374,7 +2374,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
AS_HELP_STRING([--with-macosx-version-max-allowed=<version>],
[set the maximum allowed OS version the LibreOffice compilation can
use APIs from])
[
- e. g.: --with-macos-version-max-allowed=10.8
+ e. g.: --with-macos-version-max-allowed=10.9
see --with-macosx-sdk for more info
],
,)
@@ -2740,7 +2740,7 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use])
- for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
+ for _macosx_sdk in $with_macosx_sdk 10.9 10.10 10.11 10.12; 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}"
@@ -2759,9 +2759,6 @@ if test $_os = Darwin; then
AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
case $with_macosx_sdk in
- 10.8)
- MACOSX_SDK_VERSION=1080
- ;;
10.9)
MACOSX_SDK_VERSION=1090
;;
@@ -2775,12 +2772,12 @@ if test $_os = Darwin; then
MACOSX_SDK_VERSION=101200
;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.8--12])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.9--12])
;;
esac
if test "$with_macosx_version_min_required" = "" ; then
- with_macosx_version_min_required="10.8";
+ with_macosx_version_min_required="10.9";
fi
if test "$with_macosx_version_max_allowed" = "" ; then
@@ -2795,9 +2792,6 @@ if test $_os = Darwin; then
MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
case "$with_macosx_version_min_required" in
- 10.8)
- MAC_OS_X_VERSION_MIN_REQUIRED="1080"
- ;;
10.9)
MAC_OS_X_VERSION_MIN_REQUIRED="1090"
;;
@@ -2811,7 +2805,7 @@ if test $_os = Darwin; then
MAC_OS_X_VERSION_MIN_REQUIRED="101200"
;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.8--12])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.9--12])
;;
esac
@@ -2835,9 +2829,6 @@ if test $_os = Darwin; then
fi
case "$with_macosx_version_max_allowed" in
- 10.8)
- MAC_OS_X_VERSION_MAX_ALLOWED="1080"
- ;;
10.9)
MAC_OS_X_VERSION_MAX_ALLOWED="1090"
;;
@@ -2851,7 +2842,7 @@ if test $_os = Darwin; then
MAC_OS_X_VERSION_MAX_ALLOWED="101200"
;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.8--12])
+ AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.9--12])
;;
esac
@@ -5897,18 +5888,7 @@ if test "$GCC" = "yes"; then
dnl 20080519, 4.3.1 is 20080606) for Clang (for which GCC_VERSION is
notoriously
dnl "too old"):
if test "$_os" = Darwin; then
- dnl On Mac OS X, both /usr/lib/libstdc++.6.dylib and
- dnl /usr/lib/libc++1.dylib delegate to /usr/lib/libc++abi.dylib for the
- dnl __cxa_guard_* functionality; up to 10.8, libc++abi.dylib is
- dnl apparently provided by a libcppabi project that has broken
semantics
- dnl (cf.
<http://www.opensource.apple.com/source/libcppabi/libcppabi-26/
- dnl src/cxa_guard.cxx>), while in 10.9 (verified at least on 10.9.4) it
- dnl is apparently provided by LLVM's libcxxabi project, which has good
- dnl semantics (cf. <http://llvm.org/svn/llvm-project/libcxxabi/trunk/
- dnl src/cxa_guard.cpp>):
- if test "$MAC_OS_X_VERSION_MIN_REQUIRED" -ge 1090; then
- HAVE_THREADSAFE_STATICS=TRUE
- fi
+ HAVE_THREADSAFE_STATICS=TRUE
elif test "$_os" != Android; then
if test "$COM_IS_CLANG" = TRUE; then
AC_LANG_PUSH([C++])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
