[PATCH 10/11] fdo#42865: privatized unique empty string symbol:

Michael Stahl mstahl at redhat.com
Thu May 17 14:00:20 PDT 2012


Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
(cherry picked from commit 6ce7c569b0af512217fe4825f4ccc5f7860dceec)

Conflicts:
	cppu/util/cppu.map
	cppu/util/uno_purpenvhelpergcc3.map
	cppuhelper/source/gcc3.map
	sal/util/sal.map
	sal/util/sal_textenc/saltextenc.map
	salhelper/source/gcc3.map
---
 solenv/bin/addsym.awk |    1 +
 1 file changed, 1 insertion(+)

diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 4c18bdc..a9e64fb 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,6 +43,7 @@ END {
     print "GLIBCXX_3.4 {"
     print "global:"
     print "_ZGVNSt7num_put*; _ZNSt7num_put*;"
+    print "_ZNSs4_Rep20_S_empty_rep_storageE;"
     print "};"
 }
 state == 2 {
-- 
1.7.10.2


--------------010505030800000506090404
Content-Type: text/x-patch;
 name="0011-release-branch-only-Wno-deprecated-declarations-alwa.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0011-release-branch-only-Wno-deprecated-declarations-alwa.pa";
 filename*1="tch"



More information about the LibreOffice mailing list