From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Aug 2012 08:41:17 +0000 (+0000)
Subject: debian-hardened-buildflags
X-Git-Tag: archive/raspbian/1%5.2.5-2+rpi1~2^2^2^2^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1151a998c93535029a60b628f659d140f80f1f0;p=libreoffice.git

debian-hardened-buildflags


Gbp-Pq: Name debian-hardened-buildflags.diff
---

diff --git a/configure.in b/configure.in
index ad16f8474ae..e43e113d922 100644
Binary files a/configure.in and b/configure.in differ
diff --git a/set_soenv.in b/set_soenv.in
index 067f34b6b9a..d5f8f83023a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1573,6 +1573,10 @@ ToFile( "COMPATH",           $COMPATH,           "e" );
 ToFile( "CPU",               $CPU,               "e" );
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
 ToFile( "CDEFAULTOPT",       "@CDEFAULTOPT@",    "e" );
+ToFile( "HARDEN_CFLAGS",     "@HARDEN_CFLAGS@",  "e" );
+ToFile( "HARDEN_CXXFLAGS",   "@HARDEN_CXXFLAGS@","e" );
+ToFile( "HARDEN_CPPFLAGS",   "@HARDEN_CPPFLAGS@","e" );
+ToFile( "HARDEN_LDFLAGS",    "@HARDEN_LDFLAGS@", "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "GVER",              $GVER,              "e" );
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c094bb424b5..d6ebb81b2f3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -46,6 +46,8 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
 endif
 
+LDFLAGS += $(HARDEN_LDFLAGS)
+
 # if enabled we link all of these libraries into one larger, merged library
 # for which we can do a lot more optimisation, and which is faster to read
 # from disk.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 574e8515bff..aced5376ad2 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -145,6 +145,9 @@ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
 endif
 endif
 
+gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
+gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
+
 include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
@@ -244,6 +247,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 include $(GBUILDDIR)/Deliver.mk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 94495c59aea..c3a2d7d230a 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -241,6 +241,10 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
+LINKFLAGS += $(HARDEN_LDFLAGS)
+CDEFS += $(HARDEN_CPPFLAGS)
+CFLAGS += $(HARDEN_CFLAGS)
+
 # libraries for linking applications
 STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
 STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed