From 0991c5edbad18b8be28e901b93fe3a6f8ffa26a1 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 25 Mar 2023 16:22:00 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS =================================================================== Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 460244 -> 460384 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index cff4e619408..7fced34c16a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -80,6 +80,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 f705d012fa86a5acfc9dfcb1c88586b06806f359..84f8f538b2b0371db82308ec7472403fe40d55df 100644 GIT binary patch delta 168 zcmcc8E%Ts9rlEzgg{g(Pg=GutlLhseX$mE&#U%>56$<*L#YOr_nR)st1=;DkNu`-N zDQP*0>BZIxB^jxCTnZ52;TYuN>KE@E5a8zH=pJmFfTmhOS2sPiL;)tRU}UGCl3J#p mSDKTPz?GKC<>(wA9O@Jtq5(FD3t>|G!v(C{A1+|~oB{y*k~rP~ delta 34 qcmaFRBXgx&rlEzgg{g(Pg=GutlLgZsE@G8x?^?*Zy=x)cwG;pWeGcsa diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569d..129a5ab7f65 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -238,6 +238,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # This is used to detect whether LibreOffice is being built (as opposed to building -- 2.30.2