From: Debian LibreOffice Maintainers Date: Mon, 7 May 2018 13:47:22 +0000 (+0100) Subject: debian-hardened-buildflags-no-LO-fstack-protector-strong X-Git-Tag: archive/raspbian/1%6.0.4-1+rpi1^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50786950b5506b3c9ef37c9113fe8c11b017149c;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 61ae5a70427..eb3a70566b4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -234,7 +234,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_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ diff --git a/configure.ac b/configure.ac index 6795df12306..a6b6360ae8e 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 1a6eebe7f45..c0575d512ab 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