debian-hardened-buildflags-no-LO-fstack-protector-strong
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Thu, 14 Dec 2017 23:29:20 +0000 (23:29 +0000)
committerRene Engelhard <rene@debian.org>
Thu, 14 Dec 2017 23:29:20 +0000 (23:29 +0000)
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

config_host.mk.in
configure.ac
solenv/gbuild/platform/com_GCC_defs.mk

index 0f7f5144219b9eab17ebc1bdd264e0f5685bab7c..a54e360bf4294b8f42a8f19d6810f8d7735f51b4 100644 (file)
@@ -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@
index 5c99370ee0628d529d1748494dcbdc23103365cb..23c146ab669de765eec24212c818092b3d97998b 100644 (file)
Binary files a/configure.ac and b/configure.ac differ
index 98666902f5794aef0054afe8b96f518a06c83a31..b3012c37ddfcfe1ad6e831e7d7b5b0d60c31037c 100644 (file)
@@ -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