[med-svn] [seqan2] 01/03: Fix architecture detection logic

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/2.3.0_1.20161019_af07bc1+dfsg-4
in repository seqan2.

commit b839e380fc15db324d0966932b4565651c5c14b4
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Oct 25 08:00:36 2016 -0700

    Fix architecture detection logic
    
    https://www.gnu.org/software/make/manual/html_node/Text-Functions.html#index-filter
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aa2bd2..52ffdbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 seqan2 (2.3.0~1.20161019~af07bc1+dfsg-4) UNRELEASED; urgency=medium
 
   * Skip unneeded build for -indep.
+  * Fix architecture detection logic.
 
  -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 24 Oct 2016 11:30:34 -0700
 
diff --git a/debian/rules b/debian/rules
index 05505f2..8397299 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,11 @@ CXXFLAGS+=$(CPPFLAGS)
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEB_BUILD_ARCH          ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
+ifneq (,$(filter mips mipsel,$(DEB_BUILD_ARCH)))
     export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS | sed 's/-O[1-9]//') -O1 -mxgot
 endif
 # Disable parallel building on some archs to save memory
-ifneq (,$(filter $(DEB_BUILD_ARCH),armhf mips kfreebsd%))
+ifneq (,$(filter armhf mips kfreebsd%,$(DEB_BUILD_ARCH)))
     $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
     TDBO := $(DEB_BUILD_OPTIONS)
     export DEB_BUILD_OPTIONS = $(filter $(TDBO), parallel) parallel=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git