From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 30 Nov 2023 18:47:03 +0000 (+0100)
Subject: debian-hardened-buildflags-CPPFLAGS
X-Git-Tag: archive/raspbian/4%7.6.4_rc1-1+rpi1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a359c4bdbdc20c55d6ebe591455aa3983c522ed3;p=libreoffice.git

debian-hardened-buildflags-CPPFLAGS


Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index ae534134297..266a1c6f45e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -96,6 +96,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 cc63d1a8486..d0ec9e3f480 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f14e9f1a1ed..c1b95a69bea 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -272,6 +272,8 @@ gb_GLOBALDEFS += \
 		DISABLE_DYNLOADING \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes: