From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 3 Mar 2022 17:24:16 +0000 (+0000)
Subject: debian-hardened-buildflags-CPPFLAGS
X-Git-Tag: archive/raspbian/1%7.3.1-1+rpi1^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60b05b8e1783f04d158a592fd1d88d4dd0bb1fa3;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 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 4c984934e06..2f0f61b7b13 100644
Binary files a/configure.ac and b/configure.ac differ
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: