[med-svn] [SCM] sra-sdk branch, master, updated. debian/2.0.1-1-4-g9e6e831

[Andreas Tille]

The following commit has been merged in the master branch:
commit 9e6e8314142952f2f7d5d256f4da274cdebbe251
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 20 09:46:09 2011 +0100

    Suggest patches which might help fixing #627861

diff --git a/debian/changelog b/debian/changelog
index 999f28e..8386f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 sra-sdk (2.1.0-1) UNRELEASED; urgency=low
 
+  [ Charles Plessy ]
   * New upstream release (Closes: #627861).
 
- -- Charles Plessy <plessy at debian.org>  Sun, 26 Jun 2011 12:11:18 +0900
+  [ Andreas Tille ]
+  * Suggest patches for build system to build on non i386&amd64 architectures
+    as well as BSD and Hurd
+
+ -- Andreas Tille <tille at debian.org>  Tue, 20 Dec 2011 09:28:51 +0100
 
 sra-sdk (2.0.1-1) unstable; urgency=low
 
diff --git a/debian/patches/10_portability.patch b/debian/patches/10_portability.patch
new file mode 100644
index 0000000..5f1566f
--- /dev/null
+++ b/debian/patches/10_portability.patch
@@ -0,0 +1,61 @@
+--- sra-sdk.orig/build/Makefile.gcc
++++ sra-sdk/build/Makefile.gcc
+@@ -46,12 +46,6 @@
+ # tool options
+ WARN = -Wall # -Wconversion
+ 
+-ifeq (64,$(BITS))
+-	CARCH = -m64
+-else
+-	CARCH = -m32
+-endif
+-
+ ifeq (prof, $(BUILD))
+ 	PROF = -pg
+ endif
+--- sra-sdk.orig/build/Makefile.shell
++++ sra-sdk/build/Makefile.shell
+@@ -26,6 +26,7 @@
+ # determine OS
+ UNAME = $(shell uname -s)
+ 
++OS = ''
+ ifeq (Darwin, $(UNAME))
+ 	OS = mac
+ endif
+@@ -41,11 +42,16 @@
+ ifeq (xMINGW, $(findstring xMINGW,x$(UNAME)))
+ 	OS = win
+ endif
++# handle all other OSes (like BSD or Hurd) as if they were linux (see bug #627861)
++ifeq ($(OS), '')
++	OS = linux
++endif
+ 
+ # OS flavor is normally OS
+ OSFLAV = $(OS)
+ 
+ # determine ARCH
++ARCH=''
+ ifeq (mac,$(OS))
+ 	ARCH = $(shell $(TOP)/build/mac.arch.sh)
+ else
+@@ -70,13 +76,13 @@
+ 		ARCH = sparc32
+ 	endif
+ endif
++# Handle all other architectures equivalent as i386 (see bug #627861)
++ifeq ($(ARCH),'')
++	ARCH = i386
++endif
+ 
+ # determine BITS
+-ifeq (x86_64, $(ARCH))
+-	BITS = 64
+-else
+-	BITS = 32
+-endif
++BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
+ 
+ # first pass through defines SRCDIR
+ ifndef SRCDIR
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a2cecac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_portability.patch

-- 
Utilities for the NCBI Sequence Read Archive