[libreoffice] 04/04: the config_host.mk.in hunk of course also needs to be moved

[Rene Engelhard]

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 73a895853471d857a9845fc24406a2386969fe2c
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Oct 20 14:51:09 2017 +0000

    the config_host.mk.in hunk of course also needs to be moved
---
 patches/debian-hardened-buildflags-CPPFLAGS.diff               |  8 --------
 ...bian-hardened-buildflags-no-LO-fstack-protector-strong.diff | 10 ++++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index f4d0228..f97ecd6 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -22,14 +22,6 @@
  export CROSS_COMPILING=@CROSS_COMPILING@
  export CURL=@CURL@
  export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-@@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@
- 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@
 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
 index c71cb40..f826d65 100644
 --- a/solenv/gbuild/gbuild.mk
diff --git a/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
index e97bb22..a7671b2 100644
--- a/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
+++ b/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
@@ -38,3 +38,13 @@ index 7acd068..b6d9735 100644
  ifeq ($(ENABLE_PCH),TRUE)
  ifneq ($(COM_IS_CLANG),TRUE)
  gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch
+--- a/config_host.mk.in-old	2012-04-06 14:17:55.164239390 +0200
++++ b/config_host.mk.in	2012-04-06 14:18:55.440239065 +0200
+@@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@
+ 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@

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