From 1d1751f6315ea2803c5cb41ea1be296695aa5a74 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 21 May 2020 12:43:43 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 467435 -> 467575 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 9d51a9f5d1c..b68989207b7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -86,6 +86,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 1e66efee5fdf0f286876736f10a001ba536adcb4..f04c281cb000157881843d31d1173ceb7ec0bbc0 100644
GIT binary patch
delta 168
zcmaETSmyf?nT8g|7N!>F7M3lnFQ3$BrYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9
zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9<CUETE55(SvNf{~qmN@|&Y
mUTIEF0#{llm!orhaHvyohz8goE`&+#&z`VufA)lp)fNDbGC4v3

delta 34
qcmex<MCSEjnT8g|7N!>F7M3lnFP}_Lc*ZK#-v5+!d;e3m7d8MHi4YS2

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d41c40123bc..29d78aafff5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -251,6 +251,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2