[Debian-med-packaging] Bug#914715: mafft FTCBFS: builds for the wrong architecture

[Helmut Grohne]

Source: mafft
Version: 7.402-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

mafft fails to cross build from source, because it builds for the wrong
architecture. Using dh_auto_build fixes that. While implementing the
patch, I noticed that the --sourcedirectory flag makes the packaging a
bit easier, so that's included in the attached patch. Please consider
applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru mafft-7.402/debian/changelog mafft-7.402/debian/changelog
--- mafft-7.402/debian/changelog	2018-05-28 16:17:10.000000000 +0200
+++ mafft-7.402/debian/changelog	2018-11-26 17:20:38.000000000 +0100
@@ -1,3 +1,11 @@
+mafft (7.402-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_build pass cross tools to make. (Closes: #-1)
+  * Also simplify debian/rules using --sourcedirectory.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 26 Nov 2018 17:20:38 +0100
+
 mafft (7.402-1) unstable; urgency=medium
 
   * New upstream version
diff --minimal -Nru mafft-7.402/debian/rules mafft-7.402/debian/rules
--- mafft-7.402/debian/rules	2018-05-28 16:17:10.000000000 +0200
+++ mafft-7.402/debian/rules	2018-11-26 17:20:38.000000000 +0100
@@ -8,10 +8,10 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=core
 
 override_dh_auto_build:
-	$(MAKE) -C core \
+	dh_auto_build -- \
 	  PREFIX=/usr/lib/mafft \
 	  ENABLE_MULTITHREAD=-Denablemultithread \
 	  LIBDIR=/usr/lib/mafft/lib/mafft \
@@ -19,14 +19,13 @@
 	  LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
 
 override_dh_clean:
-	[ ! -f core/Makefile ] || $(MAKE) -C core clean
 	rm -rf binaries/* scripts/*
 	dh_clean
 
 MAFFT = MAFFT_BINARIES=$(CURDIR)/binaries scripts/mafft
 
-override_dh_install:
-	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft MANDIR=$(CURDIR)/debian/mafft/usr/share/man/man1 LIBDIR=$(CURDIR)/debian/mafft/usr/lib/mafft/lib/mafft install
+override_dh_auto_install:
+	dh_auto_install -- PREFIX=/usr/lib/mafft MANDIR=/usr/share/man/man1 LIBDIR=/usr/lib/mafft/lib/mafft
 	rm debian/mafft/usr/lib/mafft/lib/mafft/*.1
 
 override_dh_compress: