From 654de2f3edb54b7665b0df8214211036808d055e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 28 Sep 2024 13:36:47 +0000
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

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

diff --git a/config_host.mk.in b/config_host.mk.in
index d6e4fc78857..6344eb9d4dc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -99,6 +99,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 e2386fce3b755a8a1e32ac935d52993c40daa482..36de7f6bd8f84f8145b7cfe81779ee4daa0fc9f2 100644
GIT binary patch
delta 170
zcmZ4gKz8>-*@hOz7N!>F7M2#)Eo_NQ^_gi3C8@<F3c3{v`lZE1`bn92`Y8q3>AFd!
znK>zGIf?1T)(RyVsd-!q5a8h$<l^cV?;H@|=HuudY@2|lT0vJgJ+(vuCa+**r=OBq
nrk_`ulas)emdWMl93LF&6da-fHi!#hQhOW|+x9pn_KUdy;fpp<

delta 36
scmdn}P<H(T*@hOz7N!>F7M2#)Eo_NQ)A=3QrQ11}*|u{qvv1A?0P^b#FaQ7m

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9..137b6e5e9b7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,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