From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 2 Dec 2017 00:01:41 +0000 (+0000)
Subject: debian-hardened-buildflags-no-LO-fstack-protector-strong
X-Git-Tag: archive/raspbian/1%5.4.3-4+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a2274e6e2e07dcb22a3b96e3d7e50b1d657e0e8;p=libreoffice.git

debian-hardened-buildflags-no-LO-fstack-protector-strong

don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.


Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index 0f7f5144219..a54e360bf42 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -236,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 f58ec57e184..d85193f91a5 100644
Binary files a/configure.ac and b/configure.ac differ
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