From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 9 Nov 2022 16:20:12 +0000 (+0000)
Subject: debian-hardened-buildflags-CPPFLAGS
X-Git-Tag: archive/raspbian/1%7.4.2-4+rpi1~1^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2cd653f0915d9eb5916e5edc0058d47d7968135;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 09a98ed5946..b2bfa83e676 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 574f8bfc755..907e4177461 100644
Binary files a/configure.ac and b/configure.ac differ
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: