[atlas] 06/06: Inject flags from dpkg-buildflags into the generic package.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository atlas.

commit 481e82404907a5d93f233903d780134447ab5cd2
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Aug 2 00:04:53 2017 +0200

    Inject flags from dpkg-buildflags into the generic package.
    
    Incidentally, this means that the noopt and nostrip flags of DEB_BUILD_OPTIONS
    are now supported.
    
    Closes: #697203
    Gbp-Dch: Full
---
 debian/rules | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4570460..f74cfa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,33 +48,45 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 PMAKE += -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
+# Some ATLAS code uses improper format strings, so disable this
+export DEB_BUILD_MAINT_OPTIONS=hardening=-format
+
 GFORTRAN_LIB_PATH := $(shell $(CC) -print-search-dirs | grep ^install: | awk '{print $$2}')
 
 # Flags common to both the generic and custom packages
 COMMON_CONFIG_PARAMS := --prefix="$(CURDIR)/debian/tmp"			 	\
 	--incdir="$(CURDIR)/debian/tmp/usr/include/"				\
 	--libdir="$(CURDIR)/debian/tmp/usr/lib/atlas-base/"			\
-	--cc="$(CC)" 								\
-	--cflags="$(CFLAGS)" 							\
 	-D c -DWALL 								\
-	-Fa alg '-fPIC' 							\
 	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"	\
 	-Ss pmake '$(PMAKE)'							\
 	-Ss flapack /usr/lib/liblapack_pic.a 					\
 	-v 2
 
-# Flags used only for the generic package
-# The cripple-atlas-performance flag is needed for disabling the CPU throttling
-#  check, because on some buildds CPU throttling is enabled and we have no way
-#  of disabling it.
+# Flags used only for the generic package.
+# - the cripple-atlas-performance flag is needed for disabling the CPU
+#   throttling check, because on some buildds CPU throttling is enabled and we
+#   have no way of disabling it;
+# - disable multi-threading (-t 0), because otherwise the package FTBFS on some
+#   single-processor machines;
+# - enforce gcc as the compiler for all uses (except for compiling probes,
+#   in --cc), because otherwise architectural defaults do not work.
 GENERIC_CONFIG_PARAMS := 					\
 	-b $(DEB_HOST_ARCH_BITS)				\
 	-A $(MACHTYPE) 						\
 	-V $(ASMDIA) 						\
 	-t 0 							\
+	--cc="$(CC)" 						\
+	--cflags="$(CPPFLAGS) $(CFLAGS)"			\
+	-C acg gcc						\
+	-F acg "$(CPPFLAGS) $(CFLAGS) -fPIC"			\
+	-C if gfortran						\
+	-F if "$(FFLAGS) -fPIC"					\
 	-Ss ADdir ../../debian/archdefs/$(DEB_HOST_ARCH_CPU)	\
 	--cripple-atlas-performance
 
+CUSTOM_CONFIG_PARAMS := -Fa alg '-fPIC'
+
 %:
 	dh $@
 
@@ -99,7 +111,7 @@ endif
 ifeq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
 	cd build && ../configure $(COMMON_CONFIG_PARAMS) $(GENERIC_CONFIG_PARAMS)
 else
-	cd build && ../configure $(COMMON_CONFIG_PARAMS)
+	cd build && ../configure $(COMMON_CONFIG_PARAMS) $(CUSTOM_CONFIG_PARAMS)
 
 endif
 	@echo "=============================================="

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