[Libreoffice-commits] core.git: expat/StaticLibrary_expat.mk openssl/ExternalProject_openssl.mk

[Stephan Bergmann]

 expat/StaticLibrary_expat.mk       |    1 -
 openssl/ExternalProject_openssl.mk |    3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d257209a5443e27cefc8872151d776767605cbae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 10 15:49:28 2013 +0200

    Revert "fix gold warning about hidden symbols"
    
    This reverts commit 9ff0ee4905068cbc85acf85da1b3ef762b324ed7.  Whatever the gold
    warnings are exactly, this is apparently not the right fix.
    
    The change to openssl/ExternalProject_openssl.mk caused crashes when LO's
    libneon.so, statically linking in LO's libssl.a, started to export symbols like
    SSLv23_client_method as global, competing with the same symbol from a system's
    libssl.so.  See the mail thread starting at
    <http://lists.freedesktop.org/archives/libreoffice/2013-June/053119.html>
    "strange crash in SSL code while opening some documents."
    
    Whether the change to expat/StaticLibrary_expat.mk caused similar problems is
    not clear to me, but it is probably best to revert both to be on the save side,
    and see what exactly the gold warning was about and how to fix it the right way
    if it ever shows up again.

diff --git a/expat/StaticLibrary_expat.mk b/expat/StaticLibrary_expat.mk
index 1c02e02..2f75452 100644
--- a/expat/StaticLibrary_expat.mk
+++ b/expat/StaticLibrary_expat.mk
@@ -45,7 +45,6 @@ endif
 # suppress warning spam
 $(eval $(call gb_StaticLibrary_add_cflags,expat,\
 	-w \
-	$(if $(filter GCC,$(COM)),-fvisibility=default) \
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 87397fe..ed99fe5 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -85,6 +85,9 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 			$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) build_libs \
+			CC="$(CC) $(if $(filter-out WNT,$(OS)),\
+			$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
+			-fvisibility=hidden))" \
 	)
 endif
 # vim: set noet sw=4 ts=4: