diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-06-09 00:33:38 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-10-02 14:58:37 +0200 |
commit | 5d096341f7318c69eb557dcfcf4f95e0b4b77463 (patch) | |
tree | fe75f896bef71ce30a134acc3f38bfae56821886 /external | |
parent | 6d82539be0f72aa4308aad5c31cc6f6b66e73134 (diff) |
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@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 9 |
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 |