[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Architecture field based on another package Architecture field



"Aaron M. Ucko" <ucko@debian.org> writes:

> I am testing these changes now (against a checkout of your experimental
> branch) and will follow up with a full patch if they work.

I meant

  $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

and

  ifeq "" "$(SKIP_NFFTL)"

Having fixed those typos, I produced the attached patch, which works for me.

-- 
Aaron M. Ucko, KB1CJC (amu at alum.mit.edu, ucko at debian.org)
http://www.mit.edu/~amu/ | http://stuff.mit.edu/cgi/finger/?amu@monk.mit.edu

diff --git a/debian/rules b/debian/rules
index e069e78..18a23c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,15 @@
 
 DH_VERBOSE = 1
 
+libdir := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+ifeq "" "$(wildcard $(libdir)/libfftw3l.so)"
+SKIP_NFFTL = -Nlibnfft3-long2
+endif
+
 %:
 	dh $@ --parallel --with autoreconf \
-		--dbg-package=libnfft3-dbg
+		--dbg-package=libnfft3-dbg $(SKIP_NFFTL)
 
 override_dh_auto_configure:
 	sh ./bootstrap.sh
@@ -23,6 +29,7 @@ override_dh_auto_configure:
 		--enable-single \
 		--program-suffix=f \
 		--disable-doxygen-doc
+ifeq "" "$(SKIP_NFFTL)"
 	dh_auto_configure --builddirectory=nfftl -- \
 		--disable-static \
 		--enable-all \
@@ -32,25 +39,32 @@ override_dh_auto_configure:
 		--enable-long-double \
 		--program-suffix=l \
 		--disable-doxygen-doc
+endif
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=nfft
 	dh_auto_build --builddirectory=nfftf
+ifeq "" "$(SKIP_NFFTL)"
 	dh_auto_build --builddirectory=nfftl
+endif
 	# make documentation in nfft build tree
 	cd $(CURDIR)/nfft && make doc
 
 override_dh_auto_clean:
 	dh_auto_clean --builddirectory=nfft
 	dh_auto_clean --builddirectory=nfftf
+ifeq "" "$(SKIP_NFFTL)"
 	dh_auto_clean --builddirectory=nfftl
+endif
 	# clean main tree
 	#dh_auto_clean --builddirectory=$(CURDIR)
 
 override_dh_auto_install-arch:
 	dh_auto_install --builddirectory=nfft --package=libnfft3-double2
 	dh_auto_install --builddirectory=nfftf --package=libnfft3-single2
+ifeq "" "$(SKIP_NFFTL)"
 	dh_auto_install --builddirectory=nfftl --package=libnfft3-long2
+endif
 
 override_dh_auto_test:
 	dh_auto_test --builddirectory=nfft

Reply to: