[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.10.8.1-1-3-g96d7d4a

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 96d7d4a3a91ab204958ff26b9210328c5db82e19
Author: Moritz Muehlenhoff <jmm at debian.org>
Date:   Wed Mar 21 21:56:06 2012 +0100

    Use dpkg-buildflags for enabling hardened build flags (closes: #657518)

diff --git a/debian/rules b/debian/rules
index be9cc24..8cfffd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,12 +50,6 @@ else
 	CONF_FLAGS += --with-sgen=no
 endif
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0 -g
-else
-	CFLAGS += -O2 -g
-endif
-
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	MINI_TEST = true
 	MONO_BOEHM_TEST = true
@@ -78,7 +72,10 @@ else
 	MDB_VARS += -Vmdb:Recommends=$(MDB_REL)
 endif
 
-CONFIGURE =	CFLAGS="$(CFLAGS)" \
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+CONFIGURE =	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"   \
 		./configure $(CONF_FLAGS) --prefix=/usr \
 		  --mandir=\$${prefix}/share/man \
 		  --infodir=\$${prefix}/share/info --sysconfdir=/etc \

-- 
mono