From 2d6e90ffee6406caef8977e736200a02411d9d17 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 18 Aug 2021 07:56:00 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 504330 -> 504470 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 8280816cab9..e3b29b11422 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 7fa717ab3dd248c0fd5ada38e4e696e21f9a1fb6..0092c4bab2fc6eb0ea43f04a2ed1bf8a1cb2f655 100644 GIT binary patch delta 178 zcmeBrA~)@+Ttf?E3sVbo3rh>@7B(*X`ph(ilGNf71>Fh-{nFwh{iMu1{gi_2bls%V z%$$_8oW%5EYlV`G)I2T)2=H(Wa&h&GcMb?}^KorX3J%c#8^nt+Nt26f`r1Zz>2_6nw(Y9+>`#jTTp2h% delta 36 scmbRCRIclZTtf?E3sVbo3rh>@7B(*X>5UF-Qtcb;*|u-6XMa`%0Q$=fMF0Q* diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 86ed3d32a37..ded93a436b7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -255,6 +255,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