[Libreoffice-commits] .: 2 commits - RepositoryFixes.mk solenv/gbuild

[Caolán McNamara]

 RepositoryFixes.mk                 |    1 +
 solenv/gbuild/platform/unxgcc.mk   |   22 ++++++++++++++++++----
 solenv/gbuild/platform/windows.mk  |    1 +
 solenv/gbuild/platform/winmingw.mk |    1 +
 4 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 5f0e3d13f65c06514428c6c7b6e94381ea843ed8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 18 14:21:52 2011 +0100

    seem to need shlwapi here too

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2f74217..5b67f7c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -120,6 +120,7 @@ gb_Library_NOILIBFILENAMES:=\
     ole32 \
     oleaut32 \
     shell32 \
+    shlwapi \
     sot \
     unicows \
     user32 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e0d611c..d92c9b0 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -458,6 +458,7 @@ gb_Library_PLAINLIBS_NONE += \
 	ole32 \
 	oleaut32 \
 	shell32 \
+	shlwapi \
 	unicows \
 	user32 \
 	uuid \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e6903d1..a7d77aa 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -475,6 +475,7 @@ gb_Library_PLAINLIBS_NONE += \
 	ole32 \
 	oleaut32 \
 	shell32 \
+	shlwapi \
 	unicows \
 	user32 \
 	uuid \
commit c109caeac1f5c2363e879963f54bc9f57baee40c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 18 09:01:37 2011 +0100

    bubble down configure test findings on visibility

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 11a0205..b58e4ba 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -59,7 +59,6 @@ endif
 
 gb_COMPILERDEFS := \
 	-D$(COM) \
-	-DHAVE_GCC_VISIBILITY_FEATURE \
 	-DCPPU_ENV=gcc3 \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
@@ -71,7 +70,6 @@ gb_CFLAGS := \
 	-fPIC \
 	-fmessage-length=0 \
 	-fno-common \
-	-fvisibility=hidden \
 	-pipe \
 
 gb_CXXFLAGS := \
@@ -85,10 +83,26 @@ gb_CXXFLAGS := \
 	-fPIC \
 	-fmessage-length=0 \
 	-fno-common \
-	-fvisibility-inlines-hidden \
-	-fvisibility=hidden \
 	-pipe \
 
+ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
+gb_COMPILERDEFS += \
+        -DHAVE_GCC_VISIBILITY_FEATURE \
+
+gb_CFLAGS += \
+        -fvisibility=hidden
+
+gb_CXXFLAGS += \
+	-fvisibility=hidden \
+
+ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE)
+gb_CXXFLAGS += \
+        -fvisibility-inlines-hidden \
+
+endif
+
+endif
+
 gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
 gb_StrictAliasingUnsafe := $(shell expr $(gb_CCVER) \< 40600)