You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/18 05:10:20 UTC
svn commit: r1774848 - in /openoffice/trunk/main:
solenv/gbuild/platform/linux.mk svl/Library_passwordcontainer.mk
Author: damjan
Date: Sun Dec 18 05:10:20 2016
New Revision: 1774848
URL: http://svn.apache.org/viewvc?rev=1774848&view=rev
Log:
#i127139# undefined reference to `__stack_chk_fail' breaks build on some Linux 32-bit systems
Work around this issue for the time being, by always explicitly linking to libc (-lc)
for all gbuild modules, which I've verified doesn't break anything. (Using the Gold linker
instead of BFD also works, also for unknown reasons, but the Gold linker may not always be
available.)
Also revert the previous workaround in main/svl/Library_passwordcontainer.mk
Patch by: me
Modified:
openoffice/trunk/main/solenv/gbuild/platform/linux.mk
openoffice/trunk/main/svl/Library_passwordcontainer.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/linux.mk?rev=1774848&r1=1774847&r2=1774848&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/linux.mk Sun Dec 18 05:10:20 2016
@@ -241,6 +241,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(LIBS) \
+ -lc \
-o $(1))
endef
Modified: openoffice/trunk/main/svl/Library_passwordcontainer.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/Library_passwordcontainer.mk?rev=1774848&r1=1774847&r2=1774848&view=diff
==============================================================================
--- openoffice/trunk/main/svl/Library_passwordcontainer.mk (original)
+++ openoffice/trunk/main/svl/Library_passwordcontainer.mk Sun Dec 18 05:10:20 2016
@@ -41,17 +41,6 @@ $(eval $(call gb_Library_add_api,passwor
offapi \
))
-ifeq ($(GUI),UNX)
-ifeq ($(COM),GCC)
-ifeq ($(CPUNAME),INTEL)
-$(eval $(call gb_Library_set_ldflags,passwordcontainer,\
- $(gb_LinkTarget_LDFLAGS) \
- -Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \
-))
-endif
-endif
-endif
-
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
cppu \
cppuhelper \