[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-128-g99fe068
The following commit has been merged in the debian-experimental-4.0 branch:
commit 7e7128f344b5fe386f45ababb70289e2c53f0177
Author: Rene Engelhard <rene@debian.org>
Date: Sat Nov 24 12:58:07 2012 +0100
unfuzzy debian-hardened-buildflags.diff again
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 2f52260..f8be3d4 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,9 +35,9 @@ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
-@@ -54,6 +54,8 @@
- gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
+@@ -61,6 +61,8 @@ gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__g
gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
+ gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_debugldflags,$(1)))
+LDFLAGS += $(HARDEN_LDFLAGS)
+
--
LibreOffice packaging repository
Reply to: