| 1 |
commit: 61d3ecd7b439ebd0d08613df3dd92b272bb523de |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 23 01:31:58 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 30 09:09:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d3ecd7 |
| 7 |
|
| 8 |
sci-biology/express: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610692 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5179 |
| 13 |
|
| 14 |
sci-biology/express/express-1.5.1.ebuild | 3 ++- |
| 15 |
sci-biology/express/files/express-1.5.1-gcc6.patch | 19 +++++++++++++++++++ |
| 16 |
2 files changed, 21 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sci-biology/express/express-1.5.1.ebuild b/sci-biology/express/express-1.5.1.ebuild |
| 19 |
index 5a7ef2f98f0..62e5361f529 100644 |
| 20 |
--- a/sci-biology/express/express-1.5.1.ebuild |
| 21 |
+++ b/sci-biology/express/express-1.5.1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2014 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
@@ -26,6 +26,7 @@ S="${WORKDIR}/${P}-src" |
| 29 |
|
| 30 |
PATCHES=( |
| 31 |
"${FILESDIR}"/${P}-buildsystem.patch |
| 32 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 33 |
) |
| 34 |
|
| 35 |
src_configure() { |
| 36 |
|
| 37 |
diff --git a/sci-biology/express/files/express-1.5.1-gcc6.patch b/sci-biology/express/files/express-1.5.1-gcc6.patch |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..8a608b97b05 |
| 40 |
--- /dev/null |
| 41 |
+++ b/sci-biology/express/files/express-1.5.1-gcc6.patch |
| 42 |
@@ -0,0 +1,19 @@ |
| 43 |
+Bug: https://bugs.gentoo.org/610692 |
| 44 |
+ |
| 45 |
+--- a/src/targets.cpp |
| 46 |
++++ b/src/targets.cpp |
| 47 |
+@@ -113,12 +113,12 @@ |
| 48 |
+ |
| 49 |
+ double ll = LOG_1; |
| 50 |
+ double tot_mass = mass(with_pseudo); |
| 51 |
+- double tot_eff_len = cached_effective_length(lib.bias_table); |
| 52 |
++ double tot_eff_len = cached_effective_length(static_cast<bool>(lib.bias_table)); |
| 53 |
+ if (neighbors) { |
| 54 |
+ foreach (const Target* neighbor, *neighbors) { |
| 55 |
+ tot_mass = log_add(tot_mass, neighbor->mass(with_pseudo)); |
| 56 |
+ tot_eff_len = log_add(tot_eff_len, |
| 57 |
+- neighbor->cached_effective_length(lib.bias_table)); |
| 58 |
++ neighbor->cached_effective_length(static_cast<bool>(lib.bias_table))); |
| 59 |
+ } |
| 60 |
+ } |
| 61 |
+ ll += tot_mass - tot_eff_len; |
Archives