[SCM] BOINC packaging branch, sid, updated. debian/7.0.27+dfsg-3-17-g2a3dda4

[Guo Yixuan]

The following commit has been merged in the sid branch:
commit ac9efebed77b020dafceb0cb097ff50c704d0941
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Jun 24 17:39:57 2012 +0800

    use dpkg-buildflags to provide default flags

diff --git a/debian/changelog b/debian/changelog
index aacae5b..dfcf48a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.27+dfsg-5) UNRELEASED; urgency=low
+
+  * debian/rules: use dpkg-buildflags to get default flags.
+
+ -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 24 Jun 2012 17:18:06 +0800
+
 boinc (7.0.27+dfsg-4) unstable; urgency=low
 
   [ Steffen Moeller ]
diff --git a/debian/rules b/debian/rules
index dc2eb47..902fee3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,12 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
+# Get default flags from dpkg-buildflags
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -99,12 +105,9 @@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu)
 endif
 
 
-CFLAGS += -g -Wall
-CXXFLAGS += -g -Wall
-CFLAGS += -D_FORTIFY_SOURCE=1 -fstack-protector
-CXXFLAGS += -D_FORTIFY_SOURCE=1 -fstack-protector
+CFLAGS += -Wall
+CXXFLAGS += -Wall
 LDFLAGS += -Wl,--as-needed
-LDFLAGS += -Wl,-z,relro
 LDFLAGS += -Wl,-z,now
 # hurd needs the following
 LDFLAGS += -Wl,--no-add-needed

-- 
BOINC packaging