[med-svn] [ngs-sdk] 01/03: Turn architecture checking for non-Intel architectures from error into warning that does not cause a failure

Andreas Tille tille at debian.org
Sat Feb 6 09:58:14 UTC 2016


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

tille pushed a commit to branch master
in repository ngs-sdk.

commit d3726dec9779c812f50ed54483682c8908c8c687
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 6 10:35:33 2016 +0100

    Turn architecture checking for non-Intel architectures from error into warning that does not cause a failure
---
 debian/changelog                                   |  3 ++
 ..._exclude_certain_architectures_explicitly.patch | 54 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad7800f..181d999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ngs-sdk (1.2.3-2) UNRELEASED; urgency=medium
 
   * debian/rules: create dynamic library in expected directory
     Closes: #813557
+  * Turn architecture checking for non-Intel architectures from error into
+    warning that does not cause a failure
+    Closes: #813559
 
  -- Andreas Tille <tille at debian.org>  Wed, 03 Feb 2016 07:53:29 +0100
 
diff --git a/debian/patches/do_not_exclude_certain_architectures_explicitly.patch b/debian/patches/do_not_exclude_certain_architectures_explicitly.patch
new file mode 100644
index 0000000..9b21ab7
--- /dev/null
+++ b/debian/patches/do_not_exclude_certain_architectures_explicitly.patch
@@ -0,0 +1,54 @@
+Description: Turn architecture checking for non-Intel architectures from error into
+  warning that does not cause a failure
+Bug-Debian: https://bugs.debian.org/813559
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 03 Feb 2016 07:53:29 +0100
+
+--- a/ngs-bam/setup/konfigure.perl
++++ b/ngs-bam/setup/konfigure.perl
+@@ -206,8 +206,7 @@ unless ($OSTYPE =~ /linux/i || $OSTYPE =
+ print "checking machine architecture... " unless ($AUTORUN);
+ println $MARCH unless ($AUTORUN);
+ unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) {
+-    println "configure: error: unsupported architecture '$OSTYPE'";
+-    exit 1;
++    println "configure: warning: possibly unsupported architecture $MARCH on '$OSTYPE'";
+ }
+ 
+ {
+--- a/ngs-java/setup/konfigure.perl
++++ b/ngs-java/setup/konfigure.perl
+@@ -206,8 +206,7 @@ unless ($OSTYPE =~ /linux/i || $OSTYPE =
+ print "checking machine architecture... " unless ($AUTORUN);
+ println $MARCH unless ($AUTORUN);
+ unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) {
+-    println "configure: error: unsupported architecture '$OSTYPE'";
+-    exit 1;
++    println "configure: warning: possibly unsupported architecture $MARCH on '$OSTYPE'";
+ }
+ 
+ {
+--- a/ngs-python/setup/konfigure.perl
++++ b/ngs-python/setup/konfigure.perl
+@@ -206,8 +206,7 @@ unless ($OSTYPE =~ /linux/i || $OSTYPE =
+ print "checking machine architecture... " unless ($AUTORUN);
+ println $MARCH unless ($AUTORUN);
+ unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) {
+-    println "configure: error: unsupported architecture '$OSTYPE'";
+-    exit 1;
++    println "configure: warning: possibly unsupported architecture $MARCH on '$OSTYPE'";
+ }
+ 
+ {
+--- a/ngs-sdk/setup/konfigure.perl
++++ b/ngs-sdk/setup/konfigure.perl
+@@ -206,8 +206,7 @@ unless ($OSTYPE =~ /linux/i || $OSTYPE =
+ print "checking machine architecture... " unless ($AUTORUN);
+ println $MARCH unless ($AUTORUN);
+ unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) {
+-    println "configure: error: unsupported architecture '$OSTYPE'";
+-    exit 1;
++    println "configure: warning: possibly unsupported architecture $MARCH on '$OSTYPE'";
+ }
+ 
+ {
diff --git a/debian/patches/series b/debian/patches/series
index c4db467..068dea8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_jni.patch
+do_not_exclude_certain_architectures_explicitly.patch

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



More information about the debian-med-commit mailing list