From 1621fa71b8bb304575260f4e4f0ba07ca7e5b42f Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 28 Nov 2022 17:32:19 +0000
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 3ea44d339a2..1eb649667b6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -93,6 +93,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 7796aba18a43bc2020aef7c28cfe839ce4d0d523..79dcf645a0dae9dc43a54ec46a71891f49733839 100644
GIT binary patch
delta 170
zcmaESK;ivCg@zW!7N!>F7M2#)Eo?G%^_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!#hQoCdw+jhx1cCSSMAv-qF

delta 36
scmaEVP~q_bg@zW!7N!>F7M2#)Eo?G%(+eBfB-;<xv28zC$F8>s02C7rOaK4?

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 075c029b095..bcd22fad9e5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -269,6 +269,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