solenv/bin/addsym.awk | 1 +
solenv/gbuild/platform/unxgcc.mk | 12 ++----------
solenv/inc/unxgcc.mk | 4 +---
3 files changed, 4 insertions(+), 13 deletions(-)
New commits:
commit 34222af48299fa1716785381b99df2520f401fd9
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Mon May 21 13:19:56 2012 +0200
don't let the Mac/PPC linker complain when the symbol isn't used
Signed-off-by: Petr Mladek <pmla...@suse.cz>
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index a9e64fb..181a077 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,7 +43,7 @@ END {
print "GLIBCXX_3.4 {"
print "global:"
print "_ZGVNSt7num_put*; _ZNSt7num_put*;"
- print "_ZNSs4_Rep20_S_empty_rep_storageE;"
+ print "_ZNSs4_Rep20_S_empty_rep_storageE*;"
print "};"
}
state == 2 {
commit 7cbaadc92f797ac718d9c49036796b4047683ca9
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 17 23:00:20 2012 +0200
fdo#42865: privatized unique empty string symbol:
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.
Change-Id: I445efb9b621638efcea80b0b83846338ca42bf7d
Signed-off-by: Petr Mladek <pmla...@suse.cz>
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 {
commit d34bbe0b86aefc8d6d282c4e6b1fff1b56aa59f9
Author: Michael Stahl <mst...@redhat.com>
Date: Fri May 18 12:53:37 2012 +0200
release branch only: -Wno-deprecated-declarations always on
Signed-off-by: Petr Mladek <pmla...@suse.cz>
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7403488..65aceeb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -105,16 +105,8 @@ ifeq ($(HAVE_CXX0X),TRUE)
#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
gb_CXXFLAGS += -std=c++0x
-#We have so many std::auto_ptr uses that we need to be able to disable
-#warnings for those so that -Werror continues to be useful, seeing as moving
-#to unique_ptr isn't an option when we must support different compilers
-
-#When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
-#warnings in isolation, but for <= 4.5.X we need to globally disable
-#deprecation
-ifeq ($(gb_GccLess460),1)
-gb_CXXFLAGS += -Wno-deprecated-declarations
-endif
+# Does anybody care if deprecated stuff is used on a release branch?
+gb_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated
endif
ifeq ($(ENABLE_LTO),TRUE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a6..7ebf7c2 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -89,9 +89,7 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
.IF "$(HAVE_CXX0X)" == "TRUE"
CFLAGSCXX+=-std=c++0x
-.IF "$(GCCNUMVER)" <= "000400059999"
-CFLAGSCXX+=-Wno-deprecated-declarations
-.ENDIF
+CFLAGSCXX+=-Wno-deprecated-declarations -Wno-deprecated
.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
.IF "$(PRODUCT)"!="full"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
