[clblas] 04/06: Minor enhancements to rules file.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri Sep 2 13:46:26 UTC 2016


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

ghisvail-guest pushed a commit to branch debian/master
in repository clblas.

commit 96c035298c971bc4515f88654d4928d342d40cb8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Sep 1 12:24:22 2016 +0100

    Minor enhancements to rules file.
    
    - s/CMAKE_BUILD_OPTIONS/BUILD_OPTIONS.
    - Clear superfluous comments.
    - Wrap, sort and format.
    
    Gbp-Dch: Full
---
 debian/rules | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index b16b477..123d1a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,30 +4,26 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# Environment information.
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
 # Fixes FTBFS on mips64* architectures. See #805893.
+DEB_HOST_ARCH := $(shell dpkg-architecture --query DEB_HOST_ARCH)
 ifneq (,$(filter mips64%,$(DEB_HOST_ARCH)))
 DEB_CFLAGS_MAINT_APPEND += -mxgot
 DEB_CXXFLAGS_MAINT_APPEND += -mxgot
 endif
 
-# Common build options.
-export CMAKE_BUILD_OPTIONS = \
-	-DBUILD_RUNTIME=ON \
-	-DBUILD_TEST=OFF \
-	-DBUILD_PERFORMANCE=OFF \
-	-DBUILD_SAMPLE=OFF \
+export BUILD_OPTIONS = \
 	-DBUILD_CLIENT=ON \
 	-DBUILD_KTEST=OFF \
+	-DBUILD_PERFORMANCE=OFF \
+	-DBUILD_RUNTIME=ON \
+	-DBUILD_SAMPLE=OFF \
 	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_TEST=OFF \
 	-DSUFFIX_LIB="/$(DEB_TARGET_MULTIARCH)"
 
 %:
@@ -38,7 +34,7 @@ override_dh_auto_clean:
 	find . -name "*.pyc" -delete
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_BUILD_OPTIONS)
+	dh_auto_configure -- $(BUILD_OPTIONS)
 
 override_dh_auto_build-indep:
 	cd doc && doxygen clBLAS.doxy

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



More information about the debian-science-commits mailing list