[SCM] ATLAS packaging for Debian branch, master, updated. debian/3.10.1-1-7-g39277e0
Sébastien Villemot
sebastien at debian.org
Sat Jul 27 14:05:35 UTC 2013
The following commit has been merged in the master branch:
commit 56e6178a14f905458e6c24c5633153768b9f48b3
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Jul 27 11:05:49 2013 +0200
Use -Si cputhrchk 0 in debian/rules
diff --git a/debian/rules b/debian/rules
index 4c850b2..a46a95f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ DEB_DH_GENCONTROL_ARGS_ALL := -- -VBuilt-Using="`dpkg-query -W -f='$${source:Pac
GFORTRAN_LIB_PATH=`$(CC) -print-search-dirs|grep ^install:|awk '{print $$2}'`
+# Flags common to both the generic and custom packages
COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" \
--incdir="$(DEB_DESTDIR)/usr/include/" \
--libdir="$(DEB_DESTDIR)/usr/lib/$$targetName" \
@@ -67,6 +68,12 @@ ifeq ($(DEB_HOST_ARCH),armhf)
COMMON_CONFIG_PARAMS += -D c -DATL_ARM_HARDFP=1
endif
+# Flags used only for the generic package
+GENERIC_CONFIG_PARAMS := \
+ -t 0 \
+ -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU) \
+ -Si cputhrchk 0
+
# The archdefs provided by ATLAS are unsuitable for armhf (see details in
# armhf.diff patch)
#
@@ -129,7 +136,7 @@ configure-stamp:
mkdir -p build/$$targetName; \
cd build/$$targetName; \
if test "$(ARCHS)" != "base__"; then \
- ../../configure $(COMMON_CONFIG_PARAMS) -t 0 -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU) -Si cputhrchk 0; \
+ ../../configure $(COMMON_CONFIG_PARAMS) $(GENERIC_CONFIG_PARAMS); \
else \
../../configure $(COMMON_CONFIG_PARAMS); \
fi; \
--
ATLAS packaging for Debian
More information about the debian-science-commits
mailing list