From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 10 Oct 2017 19:28:41 +0000 (+0100)
Subject: debian-hardened-buildflags-CPPFLAGS
X-Git-Tag: archive/raspbian/1%5.4.2-3+rpi1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2f3a2810f69a91e8994da9e1932af81a1f67f2f;p=libreoffice.git

debian-hardened-buildflags-CPPFLAGS


Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index 3327fe62352..dc93811bff8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -76,6 +76,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
@@ -235,7 +236,6 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
-export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
 export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/configure.ac b/configure.ac
index 52865bcea36..1763f6c734c 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 46d0761e731..75be87f69de 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,6 +238,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # This is used to detect whether LibreOffice is being built (as opposed to building
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 98666902f57..b3012c37ddf 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -113,12 +113,6 @@ endif
 gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
 gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
 
-ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
-gb_CFLAGS_COMMON += -fstack-protector-strong
-gb_CXXFLAGS_COMMON += -fstack-protector-strong
-gb_LinkTarget_LDFLAGS += -fstack-protector-strong
-endif
-
 ifeq ($(ENABLE_PCH),TRUE)
 ifneq ($(COM_IS_CLANG),TRUE)
 gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch