[med-svn] r22838 - in trunk/packages/bowtie/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-10-14 19:17:32 +0000 (Fri, 14 Oct 2016)
New Revision: 22838

Added:
   trunk/packages/bowtie/trunk/debian/patches/gcc-64bit.patch
Modified:
   trunk/packages/bowtie/trunk/debian/changelog
   trunk/packages/bowtie/trunk/debian/control
   trunk/packages/bowtie/trunk/debian/patches/series
Log:
Enable build on all 64bit architectures


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2016-10-13 14:00:18 UTC (rev 22837)
+++ trunk/packages/bowtie/trunk/debian/changelog	2016-10-14 19:17:32 UTC (rev 22838)
@@ -1,3 +1,11 @@
+bowtie (1.1.2-6) unstable; urgency=medium
+
+  * Enable build on all 64bit architectures (thanks for the patch to James
+    Cowgill <jcowgill at debian.org>)
+    Closes: #840775
+
+ -- Andreas Tille <tille at debian.org>  Fri, 14 Oct 2016 20:53:17 +0200
+
 bowtie (1.1.2-5) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/bowtie/trunk/debian/control
===================================================================
--- trunk/packages/bowtie/trunk/debian/control	2016-10-13 14:00:18 UTC (rev 22837)
+++ trunk/packages/bowtie/trunk/debian/control	2016-10-14 19:17:32 UTC (rev 22838)
@@ -15,7 +15,7 @@
 Homepage: http://bowtie-bio.sourceforge.net/
 
 Package: bowtie
-Architecture: amd64 kfreebsd-amd64 arm64 ppc64el
+Architecture: alpha any-amd64 arm64 mips64el ppc64 ppc64el s390x sparc64
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python

Added: trunk/packages/bowtie/trunk/debian/patches/gcc-64bit.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/gcc-64bit.patch	                        (rev 0)
+++ trunk/packages/bowtie/trunk/debian/patches/gcc-64bit.patch	2016-10-14 19:17:32 UTC (rev 22838)
@@ -0,0 +1,23 @@
+Description: Use gcc to determine if an arch is 64-bit
+ uname -m is misleading when determining if an arch is 64-bit or not
+ - It indicates the _build_ machine's processor which may not be the same as the
+   processor the code is being built for (cross compiling).
+ - It fails if a 32-bit compiler is used on a 64-bit cpu (eg build i386 packages
+   on x86_64). This is common on the mips buildds.
+ Therefore ask GCC if this architecture is 64-bit. Using __LP64__ is the easiest
+ method, but is not portable and probably only works with GCC and Clang
+ unfortunatly.
+Author: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile
++++ b/Makefile
+@@ -125,7 +125,7 @@ SEARCH_FRAGMENTS = $(wildcard search_*_p
+ VERSION = $(shell cat VERSION)
+ 
+ BITS=32
+-ifneq (,$(filter $(shell uname -m), aarch64 ppc64le x86_64))
++ifeq (1,$(shell echo __LP64__ | $(CC) -P -E -))
+ 	BITS=64
+ endif
+ # msys will always be 32 bit so look at the cpu arch instead.

Modified: trunk/packages/bowtie/trunk/debian/patches/series
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/series	2016-10-13 14:00:18 UTC (rev 22837)
+++ trunk/packages/bowtie/trunk/debian/patches/series	2016-10-14 19:17:32 UTC (rev 22838)
@@ -12,3 +12,4 @@
 enable_arm64.patch
 spelling.patch
 reproducible.patch
+gcc-64bit.patch