From 76e58e9f0949066d0675b2e32a6ee17eca34c712 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 16 Jul 2022 11:57:00 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

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

diff --git a/config_host.mk.in b/config_host.mk.in
index dae0acb4541..cf62cf84865 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -94,6 +94,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 CUCKOO_CFLAGS=$(gb_SPACE)@CUCKOO_CFLAGS@
 export CURL=@CURL@
diff --git a/configure.ac b/configure.ac
index da21c2f1ae2457053c39ecb6bc57a0ba5d87208b..546fde93cf68e495f8e9856a4ca1c9bc41df2e16 100644
GIT binary patch
delta 170
zcmdn6NMX-ng@zW!7N!>F7M2#)Eo{3g>NC?6N>YnU6m%;T^h=A2^pi64^ivA5({+<d
zGjmeXauU;vtrbc#QuDYJAi%>h$i>w!-Z>z^&BxI_*fs%8wSum0dTNOROkTmrPCq5J
oOh2zQCntd`EtAX9IX*blDL6y}Y!Da1r1tF<Y}>b2uvg9i02wqm8~^|S

delta 36
scmdn9SYg8=g@zW!7N!>F7M2#)Eo{3grW;nVNwp_bvTaYOWRIBv0RMpvQ~&?~

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