From 4c35a75a4aad2434dbd4347a25aaecaacab42d67 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 20 Apr 2022 16:39:49 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 526421 -> 526561 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) 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 ab00dd84264b9184e4abf61ad4582697bb310c89..20389a9d4fa4bf16eeb5ca9b2800e60c3ec67069 100644 GIT binary patch delta 178 zcmcaQLE+&F7M2#)Eo?vY>oe07N>YnU6m%;T^h=A2^pi64^ivA5({+h$i>w!-Z>z^&BxI_*fs%8wSum0dTNOROkTmrPCq5J wOh2zQCntd`EtAX9IX*blDL6y}Y!ENPBuy@^>4n$WrQ1ac*tUxlushBG00wtCDgXcg delta 36 scmaDjQQ_(Yg@zW!7N!>F7M2#)Eo?vYrxz5mNwv=}VB0>wfZb^Z01iP8H~;_u 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: -- 2.30.2