From 3736f5803c7be590507bac3ecc6ea14f3057e9c8 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 23 Mar 2022 19:30:37 +0000
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

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

diff --git a/config_host.mk.in b/config_host.mk.in
index d59518d2101..54798e0836a 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 c53a8d4a64b00d41c10c4530094206ff26db538c..e5067ecc906afb56d43a7e8dc59963f05c323263 100644
GIT binary patch
delta 170
zcmbQ!r?8@5p`nGbg{g(Pg{6gc3)_Lb`ph(ilGNf71>Fh-{nFwh{iMu1{gi_2bls%V
z%$$_8oW%5EYlV`G)I2T)2=H(Wa&h&GcMb?}^Ko<!woO1&t)Q!$o?4;+lUFdZ(@#k)
n)6Xl-$w}Z!%j9x&jt>rX3J%c#8^nb$seNxA+xESA?C~=I;rlnH

delta 31
mcmZ3{uP~=ip`nGbg{g(Pg{6gc3)_LbcAtE<?LPVJF*5+UmkVM5

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