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

[Tor Lillqvist]

 external/firebird/firebird-macosx.patch.1 |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6bdd4e3334b226c3ba7c4a0ca756abf5e49a0fa5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Feb 10 11:22:05 2014 +0200

    -fno-weak is unknown in the Clang 3.4 in current Xcode (5.1)
    
    (cherry picked from commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc)
    Signed-off-by: Tor Lillqvist <tml at collabora.com>
    
    Change-Id: I10611e97c17de9c00b818e22ac88ffbb736aaf37
    Reviewed-on: https://gerrit.libreoffice.org/8752
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index adede1c..0ad9bd9 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
  export DYLD_LIBRARY_PATH
  
  MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
  
  OS_ServerFiles=inet_server.cpp
  
 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+ 	fbtracemgr