[libreoffice] 01/01: oops, forgot to commit this

Rene Engelhard rene at moszumanska.debian.org
Thu Oct 19 13:37:55 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 843f4374c2132c779f6dcd4bed36f7f867392e13
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Oct 19 15:37:53 2017 +0200

    oops, forgot to commit this
---
 patches/debian-hardened-buildflags-CPPFLAGS.diff | 35 ------------------------
 1 file changed, 35 deletions(-)

diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 29e0570..f4d0228 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -1,23 +1,5 @@
 --- a/configure.ac-old	2012-03-02 21:48:47.000000000 +0000
 +++ b/configure.ac	2012-03-02 21:51:29.000000000 +0000
-@@ -5751,17 +5751,6 @@ if test "$GCC" = "yes"; then
-         AC_MSG_RESULT([no])
-     fi
- 
--    AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
--    save_CFLAGS=$CFLAGS
--    CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
--    CFLAGS=$save_CFLAGS
--    if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
--        AC_MSG_RESULT([yes])
--    else
--        AC_MSG_RESULT([no])
--    fi
--
-     AC_MSG_CHECKING([whether $CC supports atomic functions])
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-     int v = 0;
 @@ -10225,6 +10225,11 @@ else
  fi
  AC_SUBST(ENABLE_VLC)
@@ -61,20 +43,3 @@ index c71cb40..f826d65 100644
  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 7acd068..b6d9735 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list