[boinc] 01/01: Simplify flags handling

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit aa7e20b014322c8db35292e8656f9ed0f360eea8
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu May 5 01:12:28 2016 +0200

    Simplify flags handling
---
 debian/changelog |  1 +
 debian/rules     | 21 ++++-----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d22fa2b..b8e9d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ boinc (7.6.32+dfsg-1) unstable; urgency=medium
   [ Gianfranco Costamagna ]
   * New upstream release.
   * Drop debug packages.
+  * Simplify flags handling
 
   [ Steffen Moeller ]
   * Link time optimisation: corrected compiler flag management for 
diff --git a/debian/rules b/debian/rules
index 8d3a952..7e4219b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,15 +128,11 @@ endif
 CFLAGS += $(DEB_OPT_FLAGS)
 CXXFLAGS += $(DEB_OPT_FLAGS)
 
-CFLAGS_boinc-client := $(CFLAGS)
-CXXFLAGS_boinc-client := $(CXXFLAGS)
-
 # Link-time optimisation demands knowledge about all CFLAGS both at
 # compile time (as represented by CFLAGS and CXXFLAGS) but also at
 # at link time.
 ifeq (,$(findstring nolto,$(DEB_BUILD_OPTIONS)))
  $(info I: Activating LinkTimeOptimisation)
- CXXFLAGS += -flto
  CFLAGS += -flto
  LDFLAGS += -flto
 endif
@@ -185,19 +181,10 @@ CFGFLAGS_boinc-client = \
   --enable-shared \
   --enable-dynamic-client-linkage \
   --with-ssl \
-  --with-x \
-  CFLAGS="$(CFLAGS_boinc-client)" \
-  CXXFLAGS="$(CXXFLAGS_boinc-client)" \
-  CPPFLAGS="$(CPPFLAGS)" \
-  LDFLAGS="$(LDFLAGS)"
-
+  --with-x
 
 %:
-ifeq (,$(ENABLE_SERVER_TEST))
-	dh $@ --with python2,autoreconf,systemd # --parallel # this still doesn't work
-else
-	dh $@ --with python2,autoreconf,systemd
-endif
+	dh $@ --with python2,autoreconf,systemd # --parallel
 
 override_dh_clean:
 	dh_clean
@@ -267,8 +254,8 @@ override_dh_auto_build: update-boinc-applinks.1
 # we need to build zip because of the libboinc7 reference, until we split the dev packages or we move it in a new package
 #ifeq (,$(ENABLE_SERVER_TEST))
 	# FIXME For some reasons unzip build fails if hardening flags are enabled.
-	$(MAKE) -C zip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
-	$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
+	$(MAKE) -C zip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain)"
+	$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain)"
 #endif
 
 	# Generate binary message catalogs of the BOINC Manager.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git