[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-56-gd17160e
The following commit has been merged in the debian-experimental-3.7 branch:
commit d17160e2ed23a8942f5b30966bb57361276f5dfd
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 27 22:56:15 2012 +0200
unfuzzy debian-hardened-buildflags.diff again
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index e2a031d..b89f32f 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -48,7 +48,7 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..1665642 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -145,6 +145,9 @@
+@@ -155,6 +155,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
endif
@@ -58,12 +58,12 @@ index e85ed83..1665642 100644
include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
-@@ -240,6 +243,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
- gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
+@@ -291,6 +294,8 @@ ifeq ($(ENABLE_TELEPATHY),TRUE)
+ gb_GLOBALDEFS += -DENABLE_TELEPATHY
endif
-
+
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
-
+
include $(GBUILDDIR)/Deliver.mk
--
LibreOffice packaging repository
Reply to: