summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-06-10 10:49:57 +0300
committerAndras Timar <andras.timar@collabora.com>2015-10-17 23:22:33 +0200
commit857e26a871cf5057adef7cbbe112fdc7a68d3e74 (patch)
treef2fb8f6def032164c17e56573bafa1ef3a8518e1 /external
parent575c0faa37f23cc6ee3c1f4a6df4acd20d27eea8 (diff)
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@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 183129ea128c0eccdb9bc1174c4e3c8a87e78d1f)
Diffstat (limited to 'external')
-rw-r--r--external/firebird/firebird-macosx.patch.19
1 files changed, 9 insertions, 0 deletions
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index 0ad9bd90452a..42007d50a38f 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