so today i had the glorious idea to do a build on new-fangled not-even
-released-yet Fedora 17 of the libreoffice-3-5 branch with my usual
settings. unfortunately those include -Werror, and if i had known how
many of these turn up with the new gcc 4.7 i would have disabled that
instead of backporting 30 or so patches, but now it is too late :)
on top of that i propose the following for libreoffice-3-5:
* SVN 1.7 breaks python build:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7e5a6a385051569da1bf872989aef262f2d802e2
* fdo#42865 the --enable-dbgutil only problem of _GLIBCXX_DEBUG adding a
new symbol with unique linkage has re-surfaced and spread further, most
likely due to the new std::string based SAL_LOG stuff; strangely it
seems to work on Fedora 16 but on 17 it crashes and burns immediately in
sal unit tests; attached patch fixes it for -3-5 (the Conflicts are all
the gbuild converted libs on master, on -3-5 it is sufficient to fix the
addsym.awk)
* disable -Wno-deprecated-declarations because nobody cares on the
release branch (kind of silly but prevents the only warnings still left
for me), see attachment.
>From 5ee35d18a528447fd42d6bfd4848ec6d7b5849aa Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst...@redhat.com>
Date: Thu, 17 May 2012 23:00:20 +0200
Subject: [PATCH 10/11] 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.
(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
>From 45b093840003b429a3d747748013f65c6b8d4dc8 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst...@redhat.com>
Date: Fri, 18 May 2012 12:53:37 +0200
Subject: [PATCH 11/11] release branch only: -Wno-deprecated-declarations
always on
---
solenv/gbuild/platform/unxgcc.mk | 12 ++----------
solenv/inc/unxgcc.mk | 4 +---
2 files changed, 3 insertions(+), 13 deletions(-)
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"
--
1.7.10.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
