From 209b30067bb79553ca2070cd4ea966abd924d434 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 27 Sep 2024 17:38:49 +0200 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 566660 -> 566800 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index c3528e63066..31f3e9cb2c0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -99,6 +99,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 01604ceffa2d94aa14755c200dea2b2232255b23..30f6e4ff68715cd664965a0b1a5bab4cba06d036 100644 GIT binary patch delta 178 zcmZoUtu*0`QbP-43sVbo3rh>@7Pc2h>oe07N>YnU6m%;T^h=A2^pi64^ivA5({+h$i>w!-Z>z^&BxI_*fs%8wSum0dTNOROkTmrPCq5J wOh2zQCntd`EtAX9IX*blDL6y}Y!ENPBuy@^=^Ib5NwzZ{W82PnjJ^3j02^C6g#Z8m delta 31 ncmbPmMychrQbP-43sVbo3rh>@7Pc2h+e?nIZ7(^-KIc9F&bke> diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index ab6132e3b5d..9afd5976790 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -247,6 +247,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