diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-10 15:49:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-10 16:14:45 +0200 |
| commit | b7cf9c7b933fdc2dcd61e59c0022a066a8717b27 (patch) | |
| tree | ae9378864819d5d2da5fa6262f4d0ef6a91e78e4 /openssl | |
| parent | d3c17f11c8ee3c78be81fa7b85617f92852a3aa5 (diff) | |
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.
(cherry picked from commit d257209a5443e27cefc8872151d776767605cbae)
Change-Id: I3c129f4b357ce8f1cc97185b4fa01ea535825f6f
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/ExternalProject_openssl.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 87397fe9715c..ed99fe5013c4 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: |