[med-svn] [seqan2] 02/05: disable razer{,3} on mips; tweak arm{el,hf}

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/2.3.2.000platform-issues3-1d438c8+dfsg-1
in repository seqan2.

commit 3cf71dc813021c20e4688d44c6645913730074ee
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Sat Oct 28 05:17:42 2017 -0700

    disable razer{,3} on mips; tweak arm{el,hf}
---
 debian/changelog         |  6 ++++++
 debian/patches/series    |  1 +
 debian/patches/skip-mips | 28 ++++++++++++++++++++++++++++
 debian/rules             | 10 +++-------
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c721809..08a402a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+seqan2 (2.3.2.000platform-issues2-206d1f7+dfsg-2) UNRELEASED; urgency=medium
+
+  * restore parallel build blocking
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sat, 28 Oct 2017 05:26:27 -0700
+
 seqan2 (2.3.2.000platform-issues2-206d1f7+dfsg-1) experimental; urgency=medium
 
   * Typo for CXXFLAGS: -O1 instead of -01
diff --git a/debian/patches/series b/debian/patches/series
index 18f492a..208827a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 skip-seqan-revision
 fix-version_check-test
+skip-mips
diff --git a/debian/patches/skip-mips b/debian/patches/skip-mips
new file mode 100644
index 0000000..a69a6fb
--- /dev/null
+++ b/debian/patches/skip-mips
@@ -0,0 +1,28 @@
+--- seqan2.orig/apps/razers/CMakeLists.txt
++++ seqan2/apps/razers/CMakeLists.txt
+@@ -12,6 +12,11 @@
+ 
+ set (SEQAN_APP_VERSION "1.5.7")
+ 
++if ("ENV{DEB_BUILD_ARCH}" STREQUAL "mips")
++    message (STATUS "  Not building razers on mips due to memory requirements.")
++    return ()
++endif ()
++
+ # ----------------------------------------------------------------------------
+ # Dependencies
+ # ----------------------------------------------------------------------------
+--- seqan2.orig/apps/razers3/CMakeLists.txt
++++ seqan2/apps/razers3/CMakeLists.txt
+@@ -12,6 +12,11 @@
+ 
+ set (SEQAN_APP_VERSION "3.5.7")
+ 
++if ("ENV{DEB_BUILD_ARCH}" STREQUAL "mips")
++    message (STATUS "  Not building razers3 on mips due to memory requirements.")
++    return ()
++endif ()
++
+ # ----------------------------------------------------------------------------
+ # Dependencies
+ # ----------------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index f28cc08..6c5b6cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ include /usr/share/dpkg/buildflags.mk
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEB_BUILD_ARCH          ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(filter mips mipsel kfreebsd% hurd% sh4,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter armel armhf mips mipsel kfreebsd% hurd% sh4,$(DEB_BUILD_ARCH)))
     CXXFLAGS+=-O1
     CFLAGS+=-O1
 else
@@ -32,7 +32,7 @@ ifneq (,$(filter mips mipsel mips64el,$(DEB_BUILD_ARCH)))
     export CXXFLAGS+=-mxgot
 endif
 # Disable parallel building on some build archs to save memory
-ifneq (,$(filter armhf mips sh4 kfreebsd%,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter armel armhf mips sh4 kfreebsd%,$(DEB_BUILD_ARCH)))
     $(info $$DEB_BUILD_OPTIONS was [${DEB_BUILD_OPTIONS}])
     TDBO := $(DEB_BUILD_OPTIONS)
     export DEB_BUILD_OPTIONS=parallel=1,$(filter $(TDBO), parallel)
@@ -52,11 +52,7 @@ pkgdev=libseqan2-dev
 	dh $@ --parallel
 
 override_dh_auto_configure-arch:
-	# Disable the razers app on mips as the builder lacks enough memory
-#ifneq (,$(filter mips,$(DEB_BUILD_ARCH)))
-#	mv apps/razers debian/disabled_razers
-#endif
-	#	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS -DSEQAN_STATIC_APPS=False  # skip the tests for now
+	export DEB_BUILD_ARCH=${DEB_BUILD_ARCH} ; \
 	dh_auto_configure -- -DSEQAN_BUILD_SYSTEM=DEVELOP \
 		-DSEQAN_STATIC_APPS=False -DSEQAN_NO_DOX=1 \
 		-DSEQAN_DISABLE_VERSION_CHECK=YES

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