[libreoffice] 03/03: make debian-hardened-buildflags-CPPFLAGS.diff apply again
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 9cdeb1702c8e8ac952cc0d866223367729aa4a73
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 3 17:46:38 2016 +0100
make debian-hardened-buildflags-CPPFLAGS.diff apply again
---
patches/debian-hardened-buildflags-CPPFLAGS.diff | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index a6d149a..1daf740 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -65,7 +65,7 @@ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com
index 7acd068..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -103,12 +103,6 @@ endif
+@@ -106,12 +106,6 @@ endif
endif
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
@@ -75,6 +75,6 @@ index 7acd068..b6d9735 100644
-gb_LinkTarget_LDFLAGS += -fstack-protector-strong
-endif
-
- gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
-
- # This is the default in non-C++11 mode
+ ifeq ($(ENABLE_PCH),TRUE)
+ ifneq ($(COM_IS_CLANG),TRUE)
+ gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: