[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/firebird

[Tor Lillqvist]

 external/firebird/firebird-macosx.patch.1 |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 183129ea128c0eccdb9bc1174c4e3c8a87e78d1f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 10 10:49:57 2015 +0300

    Fix Firebird build against OS X SDK 10.11
    
    Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
    (cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
    Reviewed-on: https://gerrit.libreoffice.org/18716
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

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