[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac external/firebird

[Tor Lillqvist]

 configure.ac                              |   17 +++++++++++++----
 external/firebird/firebird-macosx.patch.1 |    9 +++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 6e4dfd1b8b67aafe1a83aac3a329e6b9ff091e57
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 00:33:38 2015 +0300

    accept OS X 10.11 in configure, and fix firebird build against it
    
    Accept also OS X 10.11
    
    Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550
    (cherry picked from commit bcd52844597640504d3a7caf5441f9f6181497c5)
    
    Fix Firebird build against OS X SDK 10.11
    
    Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
    (cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
    Reviewed-on: https://gerrit.libreoffice.org/18718
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/configure.ac b/configure.ac
index c6d8e86..2acaa92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2724,7 +2724,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; do
+    for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; 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}"
@@ -2752,8 +2752,11 @@ if test $_os = Darwin; then
     10.10)
         MACOSX_SDK_VERSION=101000
         ;;
+    10.11)
+        MACOSX_SDK_VERSION=101100
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--11])
         ;;
     esac
 
@@ -2782,8 +2785,11 @@ if test $_os = Darwin; then
     10.10)
         MAC_OS_X_VERSION_MIN_REQUIRED="101000"
         ;;
+    10.11)
+        MAC_OS_X_VERSION_MIN_REQUIRED="101100"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--11])
         ;;
     esac
 
@@ -2816,8 +2822,11 @@ if test $_os = Darwin; then
     10.10)
         MAC_OS_X_VERSION_MAX_ALLOWED="101000"
         ;;
+    10.11)
+        MAC_OS_X_VERSION_MAX_ALLOWED="101100"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--11])
         ;;
     esac
 
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index 0ad9bd9..42007d5 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -27,6 +27,15 @@
  
  PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
  
+@@ -57,7 +57,7 @@
+ 
+ LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS)
+ 
+-LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
++LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
+  $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME)
+ 
+ ifeq (@VOID_PTR_SIZE@,8)
 diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin
 --- firebird.org/builds/posix/postfix.darwin	2013-07-12 20:55:46.000000000 +0200
 +++ firebird/builds/posix/postfix.darwin	2013-07-15 12:07:36.000000000 +0200