diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:52:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:52:12 +0000 |
| commit | 974c21ad33bfa1d93d5ae795556d35ca7eb36e68 (patch) | |
| tree | 1a0d7c0258aadfcd993c4bffa454bcf117b382cf /debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff | |
| parent | Adding upstream version 1:7.0.4. (diff) | |
| download | libreoffice-974c21ad33bfa1d93d5ae795556d35ca7eb36e68.tar.xz libreoffice-974c21ad33bfa1d93d5ae795556d35ca7eb36e68.zip | |
Adding debian version 1:7.0.4-4+deb11u8.debian/1%7.0.4-4+deb11u8
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff')
| -rw-r--r-- | debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff b/debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff new file mode 100644 index 000000000..e9c49efd6 --- /dev/null +++ b/debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff @@ -0,0 +1,32 @@ +don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the +hardening flags from dpkg-buildflags anyway. + +diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk +index 712a61df544f..0d50f538ba7b 100644 +--- a/solenv/gbuild/platform/com_GCC_defs.mk ++++ b/solenv/gbuild/platform/com_GCC_defs.mk +@@ -67,7 +67,6 @@ gb_CFLAGS_COMMON := \ + -fmessage-length=0 \ + -fno-common \ + -pipe \ +- -fstack-protector-strong \ + $(if $(gb_COLOR),-fdiagnostics-color=always) \ + + gb_CXXFLAGS_COMMON := \ +@@ -82,7 +81,6 @@ gb_CXXFLAGS_COMMON := \ + -fmessage-length=0 \ + -fno-common \ + -pipe \ +- -fstack-protector-strong \ + $(if $(gb_COLOR),-fdiagnostics-color=always) \ + + ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE) +@@ -136,8 +134,6 @@ endif + gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden + gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) + +-gb_LinkTarget_LDFLAGS += -fstack-protector-strong +- + ifneq ($(gb_ENABLE_PCH),) + ifeq ($(COM_IS_CLANG),TRUE) + # Clang by default includes in the PCH timestamps of the files it was |