diff options
| author | Shaun Jackman | 2012-09-25 11:44:20 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2012-09-25 19:51:00 -0700 |
| commit | 26d725f5cc6a4f25ad37ef68da2610ad106e4aba (patch) | |
| tree | 0ede4e29272449911c757ce227dbdbf0703aab5b | |
| parent | 34deb8f80abf97ca2da04f09e5ad11f18795e36b (diff) | |
| download | homebrew-26d725f5cc6a4f25ad37ef68da2610ad106e4aba.tar.bz2 | |
abyss: Fix build on OS X 10.8.
Closes #15109
This patch is from upstream and will be included in the next release of ABySS.
sjackman/abyss#13
sjackman/abyss@f195d2e
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/abyss.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Library/Formula/abyss.rb b/Library/Formula/abyss.rb index f4a0fd5ca..3cc2418db 100644 --- a/Library/Formula/abyss.rb +++ b/Library/Formula/abyss.rb @@ -16,6 +16,13 @@ class Abyss < Formula # strip breaks the ability to read compressed files. skip_clean 'bin' + # Fix a compiler error on OS X 10.8 Mountain Lion. + # This issue is fixed upstream: + # https://github.com/sjackman/abyss/issues/13 + def patches + DATA + end + def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" @@ -26,3 +33,18 @@ class Abyss < Formula system "#{bin}/ABYSS", "--version" end end + +__END__ +diff --git a/Graph/ContigGraphAlgorithms.h b/Graph/ContigGraphAlgorithms.h +index 023a898..0eac936 100644 +--- a/Graph/ContigGraphAlgorithms.h ++++ b/Graph/ContigGraphAlgorithms.h +@@ -329,7 +329,7 @@ size_t addComplementaryEdges(ContigGraph<DG>& g) + if (!found) { + add_edge(vc, uc, g[e], static_cast<DG&>(g)); + numAdded++; +- } else if (g[e] != g[f]) { ++ } else if (!(g[e] == g[f])) { + // The edge properties do not agree. Select the better. + g[e] = g[f] = BetterDistanceEst()(g[e], g[f]); + } |