From 0a2e6454c9cd00be3acdd889b0d8fdf6e5ce706a Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 26 Mar 2025 17:38:59 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 580673 -> 580813 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 10389b05df9..7b1b669934d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -101,6 +101,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 be24cc9aff2f0dd36d0ea12cde9e7d161b8c6a78..c241c7f7b0feac13ec1f5d90a2cc6193102e3a21 100644 GIT binary patch delta 178 zcmX@OL;37Z<%Sl<7N!>F7M2#)Eo^BY>NC?6N>YnU6m%;T^h=A2^pi64^ivA5({+h$i>w!-Z>z^&BxI_*fs%8wSum0dTNOROkTmrPCq5J wOh2zQCntd`EtAX9IX*blDL6y}Y!ENPBuy@^>46{Fq}m%kux)Snz<%&G04C-;>Hq)$ delta 31 ncmX@RQ~BTy<%Sl<7N!>F7M2#)Eo^BY+CP0@+y3bT`|Z~N-Ruue diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b3ae841c1c1..a5e0bfc9405 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -246,6 +246,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