From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 27 Apr 2018 02:14:18 +0000 (+0100)
Subject: debian-hardened-buildflags-CPPFLAGS
X-Git-Tag: archive/raspbian/1%6.0.4_rc1-4+rpi1~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ec1da188ae335ea902d7fea7fdde193b9324ea6e;p=libreoffice.git

debian-hardened-buildflags-CPPFLAGS


Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index 3d6e6c40234..768d6271aa7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -77,6 +77,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@
diff --git a/configure.ac b/configure.ac
index d03704e1dba..3b4ccd54cc6 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b87f6fc569d..129a5ab7f65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,6 +238,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # This is used to detect whether LibreOffice is being built (as opposed to building