spack/var/spack/repos/builtin/packages/bowtie/issue-87.patch
George Hartzell b984adb386 bowtie: new versions and %gcc@8.0.0: fix (#10232)
* bowtie: new versions and %gcc@8.0.0: fix

Bowtie development shifted from Sourceforge to GitHub.

This commit adds several versions from GitHub, using the archive
tarballs.  Note that the URL for 1.2.2 tarball is actually an '_p1'
tag....

It leaves the old 1.2 release download info in place.

Versions 1.2.0 and newer come from GitHub (I'm unsure if the 1.2 and
1.2.0 are equivalent).

Include a fix that enables %gcc@8.0.0: from:

  https://github.com/BenLangmead/bowtie/issues/87

But, v1.2.2 has trouble with "newer" gcc's, so it only adds v1.2.2 for
%gcc@6.0.0:.

Feel free to tighten this.  I know that:

- 1.2 -> 1.2.2 work with %gcc@5.5.0;
- 1.2 -> 1.2.1.1 work with %gcc@8.2.0; and
- 1.2.2 fails with %gcc@8.2.0

* Tighten to `conflicts('%gcc@8:', when='@1.2.2')`

* Point 1.2.2 and 1.2.2_p1 at the 1.2.2_p1 tarball
2019-01-07 11:30:59 -06:00

23 lines
842 B
Diff

From 58c6ac97b1938909881877ef83167f5eff0e8ab1 Mon Sep 17 00:00:00 2001
From: Rone Charles <rone_charles@fastmail.com>
Date: Tue, 4 Sep 2018 21:06:39 -0400
Subject: [PATCH] Fix isa return type
---
ebwt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ebwt.h b/ebwt.h
index fe6300cc..8f886b8d 100644
--- a/ebwt.h
+++ b/ebwt.h
@@ -862,7 +862,7 @@ class Ebwt {
TIndexOffU* ftab() const { return _ftab; }
TIndexOffU* eftab() const { return _eftab; }
TIndexOffU* offs() const { return _offs; }
- uint32_t* isa() const { return _isa; } /* check */
+ TIndexOffU* isa() const { return _isa; } /* check */
TIndexOffU* plen() const { return _plen; }
TIndexOffU* rstarts() const { return _rstarts; }
uint8_t* ebwt() const { return _ebwt; }