[clasp] 01/04: debian/rules: force build with g++-7

[Thomas Krennwallner]

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

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 9c999e3aedf982a0063ab4fcd1fe1b8c64e3ab34
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Nov 4 09:43:06 2017 +0000

    debian/rules: force build with g++-7
    
    bug #871514 is fixed with g++-7 >= 7.2.0-3
---
 debian/rules | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4836141..e10955d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-# bug #871514 seems to cause mips64el FTBFS, force g++-6 for now
-export CXX = g++-6
-export CC = gcc-6
+# force g++-7
+export CXX = g++-7
+export CC = gcc-7
 # inject CPPFLAGS to CXXFLAGS
 CXXFLAGS += $(CPPFLAGS)
 
@@ -54,9 +54,8 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install --builddirectory=$(TOPBUILDDIR)
 
-# remove the whole build dir
 override_dh_auto_clean:
-	rm -rf ./build
+	dh_auto_clean --builddirectory=$(TOPBUILDDIR)
 
 # run and output test results
 override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git