[libreoffice] 128/152: revert debian-hardened-buildflags-CPPFLAGS.diff to libreoffice_5.3.0_rc1-2

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 39998e0c87154bc5320f591a0299b65a04d02796
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jan 18 00:44:33 2017 +0100

    revert debian-hardened-buildflags-CPPFLAGS.diff to libreoffice_5.3.0_rc1-2
---
 patches/debian-hardened-buildflags-CPPFLAGS.diff | 48 ++++--------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index aaecc87..29e0570 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -1,39 +1,6 @@
-From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
-Date: Sat, 9 Nov 2013 02:00:34 +0100
-Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS.diff
-
-Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
-
----
- config_host.mk.in                      |  2 +-
- configure.ac                           | 16 +++++-----------
- solenv/gbuild/gbuild.mk                |  2 ++
- solenv/gbuild/platform/com_GCC_defs.mk |  6 ------
- 4 files changed, 8 insertions(+), 18 deletions(-)
-
-diff --git a/config_host.mk.in b/config_host.mk.in
---- a/config_host.mk.in
-+++ b/config_host.mk.in
-@@ -76,6 +76,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
- export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
- export CPUNAME=@CPUNAME@
- export CDEFAULTOPT=@CDEFAULTOPT@
-+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
- export CROSS_COMPILING=@CROSS_COMPILING@
- export CURL=@CURL@
- export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-@@ -245,7 +246,6 @@ export USING_X11=@USING_X11@
- export HAMCREST_JAR=@HAMCREST_JAR@
- export HARDLINKDELIVER=@HARDLINKDELIVER@
- 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
---- a/configure.ac
-+++ b/configure.ac
-@@ -5987,17 +5987,6 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
+--- 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
  
@@ -51,7 +18,7 @@ diff --git a/configure.ac b/configure.ac
      AC_MSG_CHECKING([whether $CC supports atomic functions])
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
      int v = 0;
-@@ -10399,6 +10388,11 @@ else
+@@ -10225,6 +10225,11 @@ else
  fi
  AC_SUBST(ENABLE_VLC)
  
@@ -82,9 +49,10 @@ diff --git a/configure.ac b/configure.ac
  export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
  export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
+index c71cb40..f826d65 100644
 --- a/solenv/gbuild/gbuild.mk
 +++ b/solenv/gbuild/gbuild.mk
-@@ -243,6 +243,8 @@ gb_GLOBALDEFS += \
+@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
  		ENABLE_LTO \
  	)
  
@@ -94,6 +62,7 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
  
  # 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
@@ -109,6 +78,3 @@ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com
  ifeq ($(ENABLE_PCH),TRUE)
  ifneq ($(COM_IS_CLANG),TRUE)
  gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch
--- 
-2.7.4
-

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