From f43cb8c2e0111d03f96b9578c80c6f307a8427a8 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 29 Dec 2022 23:22:03 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 532494 -> 532634 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index b7ece1fc1c8..05a0631a816 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 74cdae6ec6ad7645160302e06d7d1022291ddd61..5a6440fea015b2d73eb9de835f89284add7c604b 100644 GIT binary patch delta 170 zcmeA>pfKy8LPHB<3sVbo3rh>@7PifG^_gi3C8@AFd! znK>zGIf?1T)(RyVsd-!q5a8h$@7PifG?e_I-+wJSwqZa}I!K4ej 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: -- 2.30.2