From: Aaron M. Ucko <ucko@debian.org>
Date: Mon, 4 Feb 2019 03:05:36 +0000 (-0500)
Subject: Fully streamline builds covering only Architecture: all.
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~167
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3838862a39d1ddb741b6f88277040ec6e3cdb3bb;p=ncbi-blast%2B.git

Fully streamline builds covering only Architecture: all.

* debian/control: Split B-Ds other than Debhelper out to Build-Depends-Arch.
* debian/rules: Also skip (dh_auto)_configure when building only
  architecture-independent binary packages.
---

diff --git a/debian/changelog b/debian/changelog
index f415c732..a7815a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 ncbi-blast+ (2.8.1-1) UNRELEASED; urgency=medium
 
   * New upstream release (NOT RELEASED YET).
-  * debian/control: Build-Depend on liblmdb-dev.
+  * debian/control:
+    - Build-Depend on liblmdb-dev.
+    - Split B-Ds other than Debhelper out to Build-Depends-Arch.
   * debian/patches: Formally update for new release.
     - Retire support_boost_1_67 (already applied upstream).
     - Update patches that apply with offsets or outright fuzz, or need
@@ -9,8 +11,10 @@ ncbi-blast+ (2.8.1-1) UNRELEASED; urgency=medium
   * debian/patches/fix_lib_deps: Link xcleanup against $(OBJEDIT_LIBS).
   * debian/patches/system_mbedtls_only (new): Omit convenience mbed TLS
     copy, which is dead weight and yielded a Lintian error.
+  * debian/rules: Also skip (dh_auto)_configure when building only
+    architecture-independent binary packages.
 
- -- Aaron M. Ucko <ucko@debian.org>  Sun, 03 Feb 2019 21:43:22 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 03 Feb 2019 22:05:36 -0500
 
 ncbi-blast+ (2.7.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d8ac77a7..d9e3483a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Uploaders: Olivier Sallou <osallou@debian.org>,
 	   Aaron M. Ucko <ucko@debian.org>
 Section: science
 Priority: optional
-Build-Depends: autotools-dev,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9)
+Build-Depends-Arch: autotools-dev,
                libboost-test-dev,
                libbz2-dev,
                libc-dev-bin,
diff --git a/debian/rules b/debian/rules
index 22a17582..b017193c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += LDFLAGS_FOR_BUILD="$(LDFLAGS)"
 BLAST2_VERSION=1:$(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2 }')
 
 llp=LD_LIBRARY_PATH
-override_dh_auto_configure:
+override_dh_auto_configure-indep:;
+override_dh_auto_configure-arch:
 	cd c++  &&  $(llp)=$(CURDIR)/c++/BUILD/lib$${$(llp)+:$$$(llp)} \
 	    CONFIG_SHELL=/bin/bash ./configure $(DEB_CONFIGURE_EXTRA_FLAGS) \
 	    ||  (tail -v -n +0 config.log BUILD/status/config.log; exit 1)