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 df3432d1ff3d6f46f903c95d7fac85068bc394c8..7e6b38f11fbbadfcfd842bfd35affee97a2b3999 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -80,6 +80,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 8d3d5e9f9af1553f0e72fe686fdf314f76d3ebb7..22217dc56b53411f15d012c4b88b49bde1d78992 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b87f6fc569dd99b6081f2b69a7446fd5f5c948d5..129a5ab7f656d63b0c9f830409ba39e5bf6d5c7e 100644 (file)
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,6 +238,8 @@ gb_GLOBALDEFS += \
                ENABLE_LTO \
        )
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # This is used to detect whether LibreOffice is being built (as opposed to building