[med-svn] [seqan2] 03/05: document partial app skipping for mips
Michael Crusoe
misterc-guest at moszumanska.debian.org
Fri Nov 3 06:58:48 UTC 2017
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 ec19b5d1f493cc99cd01d27ce6bdd35bab07c0d2
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date: Tue Oct 31 02:21:44 2017 -0700
document partial app skipping for mips
---
debian/README.Debian | 9 +++++
debian/changelog | 4 +-
debian/patches/series | 2 +-
debian/patches/skip-mips | 28 -------------
debian/patches/skip-some-apps-on-some-archs | 61 +++++++++++++++++++++++++++++
debian/rules | 10 +----
6 files changed, 75 insertions(+), 39 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 12c5300..4ca0dd8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -57,3 +57,12 @@ please file a bug report using `reportbug seqan` and let us know about
your preference.
-- Andreas Tille <tille at debian.org> Wed, 27 Nov 2013 10:26:17 +0100
+
+Note: some apps are not built for some architectures due to memory limitations:
+
+Apps not built for mips{,el}:
+ - razers
+ - razers3
+ - yara
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com> Sat, 28 Oct 2017 05:26:27 -0700
diff --git a/debian/changelog b/debian/changelog
index 08a402a..ea12bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
seqan2 (2.3.2.000platform-issues2-206d1f7+dfsg-2) UNRELEASED; urgency=medium
- * restore parallel build blocking
+ * require tests to pass everywhere
+ * skip the razers{3,} and yara apps on mips{el,}
+ * restore parallel build blocking only for armhf, sh4, and kfreebsd*
-- Michael R. Crusoe <michael.crusoe at gmail.com> Sat, 28 Oct 2017 05:26:27 -0700
diff --git a/debian/patches/series b/debian/patches/series
index 208827a..fc4f6d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
skip-seqan-revision
fix-version_check-test
-skip-mips
+skip-some-apps-on-some-archs
diff --git a/debian/patches/skip-mips b/debian/patches/skip-mips
deleted file mode 100644
index a69a6fb..0000000
--- a/debian/patches/skip-mips
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/patches/skip-some-apps-on-some-archs b/debian/patches/skip-some-apps-on-some-archs
new file mode 100644
index 0000000..51bea52
--- /dev/null
+++ b/debian/patches/skip-some-apps-on-some-archs
@@ -0,0 +1,61 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Description: Skip some architectures + Seqan app combinations
+Could be a bug in gcc or seqan, but the memory requirements on mips{,el} to
+compile three of the apps balloons beyond 14GiB, so skip them
+--- seqan2.orig/apps/razers/CMakeLists.txt
++++ seqan2/apps/razers/CMakeLists.txt
+@@ -12,6 +12,16 @@
+
+ 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 ()
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "mipsel")
++ message (STATUS " Not building razers on mipsel due to memory requirements.")
++ return ()
++endif ()
++
++
+ # ----------------------------------------------------------------------------
+ # Dependencies
+ # ----------------------------------------------------------------------------
+--- seqan2.orig/apps/razers3/CMakeLists.txt
++++ seqan2/apps/razers3/CMakeLists.txt
+@@ -12,6 +12,16 @@
+
+ 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 ()
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "mipsel")
++ message (STATUS " Not building razers3 on mipsel due to memory requirements.")
++ return ()
++endif ()
++
++
+ # ----------------------------------------------------------------------------
+ # Dependencies
+ # ----------------------------------------------------------------------------
+--- seqan2.orig/apps/yara/CMakeLists.txt
++++ seqan2/apps/yara/CMakeLists.txt
+@@ -10,6 +10,16 @@
+ project (seqan_apps_yara CXX)
+ message (STATUS "Configuring apps/yara")
+
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "mips")
++ message (STATUS " Not building yara on mips due to memory requirements.")
++ return ()
++endif ()
++if ("$ENV{DEB_BUILD_ARCH}" STREQUAL "mipsel")
++ message (STATUS " Not building yara on mipsel due to memory requirements.")
++ return ()
++endif ()
++
++
+ # ----------------------------------------------------------------------------
+ # Dependencies
+ # ----------------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 6c5b6cc..643af65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 armel armhf mips sh4 kfreebsd%,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter armhf 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)
@@ -118,11 +118,3 @@ override_dh_fixperms-indep:
chmod +x $(CURDIR)/debian/$(pkgapps)/usr/lib/seqan/bin/`basename $${bin}` ; \
done
find $(CURDIR)/debian/$(pkgdev)/usr/share/cmake -type f -exec chmod -x {} \;
-
-override_dh_auto_test:
-# enforce tests on some architectures
-ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 kfreebsd-amd64 m68k x32))
- dh_auto_test
-else
- dh_auto_test || /bin/true
-endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git
More information about the debian-med-commit
mailing list