[nfft] 05/13: Use explicit list of architectures which supports long-double precision.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.

commit d10e3ec02173a107b74aa8137d32c5eb58991b03
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat Dec 12 13:15:38 2015 +0000

    Use explicit list of architectures which supports long-double precision.
---
 debian/control |  8 ++++----
 debian/rules   | 22 ++++++++++------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 9575a57..9013a35 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Multi-Arch: same
 Depends:
  libnfft3-double2 (= ${binary:Version}),
  libnfft3-single2 (= ${binary:Version}),
- libnfft3-long2 (= ${binary:Version}),
+ libnfft3-long2 (= ${binary:Version}) [amd64 arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64el s390x x32],
  ${misc:Depends}
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -127,7 +127,7 @@ Description: library for computing non-uniform Fourier transforms (single precis
 
 Package: libnfft3-long2
 Section: libs
-Architecture: any
+Architecture: amd64 arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64el s390x x32
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -167,7 +167,7 @@ Multi-Arch: same
 Depends:
  libnfft3-double2 (= ${binary:Version}),
  libnfft3-single2 (= ${binary:Version}),
- libnfft3-long2 (= ${binary:Version}),
+ libnfft3-long2 (= ${binary:Version}) [amd64 arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64el s390x x32],
  libfftw3-dev,
  ${misc:Depends}
 Suggests:
@@ -206,7 +206,7 @@ Multi-Arch: same
 Depends:
  libnfft3-double2 (= ${binary:Version}),
  libnfft3-single2 (= ${binary:Version}),
- libnfft3-long2 (= ${binary:Version}),
+ libnfft3-long2 (= ${binary:Version}) [amd64 arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64el s390x x32],
  ${misc:Depends}
 Suggests:
  libfftw3-dbg
diff --git a/debian/rules b/debian/rules
index f24951e..3695586 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,21 +20,19 @@ COMMON_BUILD_OPTIONS = \
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# Detect whether the long-double version of FFTW is available for the host
-# architecture. If not, the long-double build of NFFT will be discarded.
-ifeq "" "$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)"
-DH_SKIP_NFFTL = --no-package=libnfft3-long2
-endif
+# Detect whether the long-double version of the FFTW library is available for
+# the host architecture. If positive, support for the long-double precision of
+# the NFFT library will be enabled.
+DH_BUILD_NFFTL ?= $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3l.so)
 
 %:
 	dh $@ --parallel --with autoreconf \
-		--dbg-package=libnfft3-dbg \
-		$(DH_SKIP_NFFTL)
+		--dbg-package=libnfft3-dbg
 
 override_dh_auto_clean-arch:
 	dh_auto_clean --arch --builddirectory=build-nfft
 	dh_auto_clean --arch --builddirectory=build-nfftf
-ifeq "" "$(DH_SKIP_NFFTL)"
+ifneq "" "$(DH_BUILD_NFFTL)"
 	dh_auto_clean --arch --builddirectory=build-nfftl
 endif
 
@@ -50,7 +48,7 @@ override_dh_auto_configure-arch:
 		--disable-doxygen-doc \
 		--enable-single \
 		--program-suffix=f
-ifeq "" "$(DH_SKIP_NFFTL)"
+ifneq "" "$(DH_BUILD_NFFTL)"
 	dh_auto_configure --builddirectory=build-nfftl -- \
 		$(COMMON_BUILD_OPTIONS) \
 		--disable-doxygen-doc \
@@ -66,7 +64,7 @@ override_dh_auto_configure-indep:
 override_dh_auto_build-arch:
 	dh_auto_build --arch --builddirectory=build-nfft
 	dh_auto_build --arch --builddirectory=build-nfftf
-ifeq "" "$(DH_SKIP_NFFTL)"
+ifneq "" "$(DH_BUILD_NFFTL)"
 	dh_auto_build --arch --builddirectory=build-nfftl
 endif
 
@@ -78,7 +76,7 @@ override_dh_auto_install-arch:
 		--package=libnfft3-double2
 	dh_auto_install --arch --builddirectory=build-nfftf \
 		--package=libnfft3-single2
-ifeq "" "$(DH_SKIP_NFFTL)"
+ifneq "" "$(DH_BUILD_NFFTL)"
 	dh_auto_install --arch --builddirectory=build-nfftl \
 		--package=libnfft3-long2
 endif
@@ -91,7 +89,7 @@ ifeq (,$(filter armel mips, $(DEB_HOST_ARCH)))
 	dh_auto_test --builddirectory=build-nfft
 # The testsuite for the long-double precision is disabled due to a bug
 # upstream: https://github.com/NFFT/nfft/issues/16.
-#ifeq "" "$(DH_SKIP_NFFTL)"
+#ifeq "" "$(DH_BUILD_NFFTL)"
 #	dh_auto_test --builddirectory=build-nfftl
 #endif
 endif

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