Kaydet (Commit) d257209a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "fix gold warning about hidden symbols"

This reverts commit 9ff0ee49.  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.
üst 9734135d
......@@ -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,\
......
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment