From f9d6bb7d00a6462d075661bb6afb0f8a36df969c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 4 May 2025 07:34:39 +0200 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 581309 -> 581449 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 6d8e8fb00d8cd8f523982b501e8be8d11d9c901f..601df584f9af5494157ec101a45e59b7dce2fc7d 100644 GIT binary patch delta 178 zcmdnHSNY^V<%Sl<7N!>F7M2#)Eo{d>)n}$Dl%y7yDCkxw=$953=_h68>8BKAr|Tw_ zX6B@%ucK!As1kc+EdymLT+n~$S=ux$dGY6V^0^wbgsn7o3KoqkGc xnSNerPEG<>S|*pHb9`{9Q*ej|*dShnNt#?-(F7M2#)Eo{d>wFiG@+aCOx{o88*+Gh@y 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