[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-74-gad0299b

[Guo Yixuan]

The following commit has been merged in the master branch:
commit ad0299b1f44952bb709335216d8feaf12693a4cf
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Thu Aug 16 22:16:57 2012 +0800

    only disable -O2 in api/ and lib/

diff --git a/debian/changelog b/debian/changelog
index 50f4f06..32eb5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ boinc (7.0.33+dfsg-1) UNRELEASED; urgency=low
   * Conditional builds of debian/control
 
   [ Guo Yixuan ]
-  * debian/rules: disable optimization (-O2) for SETI to work.
+  * debian/rules: disable optimization in api/ and lib/, for SETI to work.
 
  -- Steffen Moeller <moeller at debian.org>  Sat, 30 Jun 2012 21:59:59 +0200
 
diff --git a/debian/rules b/debian/rules
index 9f96fbd..5579b31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@
 # -Wformat -Werror=format-security will need many fixes to avoid ftbfs,
 # so it's disabled for now
 export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
-# disable optimization for SETI
-export DEB_CFLAGS_MAINT_STRIP = -O2
-export DEB_CXXFLAGS_MAINT_STRIP = -O2
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
@@ -209,12 +206,18 @@ update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 # build:
 #	dh build --parallel --with python2
 
+CFLAGS_noopt = $(subst -O2,-O0,$(CFLAGS))
+CXXFLAGS_noopt = $(subst -O2,-O0,$(CXXFLAGS))
+
 override_dh_auto_build: update-boinc-applinks.1
 	@echo
 	@echo "****        *****"
 	@echo "**** Making ****"
 	@echo "****        *****"
 	@echo
+	# disable optimization in api/ and lib/, for SETI to work
+	$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
+	$(MAKE) -C lib CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
 	$(MAKE)
 
 	# Generate binary message catalogs of the BOINC Manager.

-- 
BOINC packaging