From 3a1f4ac88c36b92474145b5ea60dc50b1ce33e74 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 10 Oct 2018 22:25:32 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 459880 -> 460020 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 564b111f19c..ec167b7a091 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 33f12a327105921a3837911b7b85b6eb59453767..b9169bc7934657a8d38716f3ec1bb23e1b6a8fb3 100644 GIT binary patch delta 168 zcmaFSA@ikErlEzgg{g(Pg=GtC#r*orG=-AX;t~bj3I+Yr;v)T|%sl;+g6wqNq|(fs zl(d}0^kQp;l8n?mE(Hkia13&B^^1272ypXpbPu*oKvS)ttDBx$q5zXuFtXE6NiEaQ lE6vGC;7ZHna&(Rl4s{9+(EuC7g)phTbUy3$()nzkQvl0%H@N@+ delta 29 lcmey;Df6O3rlEzgg{g(Pg=GtC#r$@b1+3dy7O;It0RXbn3v~bh 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