summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-09-24 17:03:46 +0200
committerDavid Seifert <soap@gentoo.org>2016-09-24 21:02:07 +0200
commit8ee85fd0668f17101b4dd8ad1b35ee0194521184 (patch)
treee9ab50fe06687fc0954a5819634c673a38273f14 /sci-libs/libmems/files
parentsci-biology/eugene: Bump to 4.1d from science-overlay (diff)
downloadgentoo-8ee85fd0668f17101b4dd8ad1b35ee0194521184.tar.gz
gentoo-8ee85fd0668f17101b4dd8ad1b35ee0194521184.tar.bz2
gentoo-8ee85fd0668f17101b4dd8ad1b35ee0194521184.zip
sci-libs/libmems: Allow for compiling with GCC 6
Gentoo-bug: 594814 * Patch taken from Debian * Add sub-slot operator for dev-libs/boost * Delete .la files Package-Manager: portage-2.3.1
Diffstat (limited to 'sci-libs/libmems/files')
-rw-r--r--sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch b/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch
new file mode 100644
index 000000000000..bde8efeb4c9c
--- /dev/null
+++ b/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch
@@ -0,0 +1,18 @@
+Description: Correct compilation with g++-6
+Author: Gert Wollny <gw.fossdev@gmail.com>
+Bug-Debian: https://bugs.debian.org/811870
+Forwarded: yes
+Bug: https://sourceforge.net/p/mauve/bugs/46/
+Last-Update: 2016-06-30
+
+--- a/libMems/ProgressiveAligner.cpp
++++ b/libMems/ProgressiveAligner.cpp
+@@ -1599,7 +1599,7 @@
+ c.SetLeftEnd(child_1, ancestral_matches[mI]->LeftEnd(1));
+ c.SetOrientation(child_1, ancestral_matches[mI]->Orientation(1));
+ c.SetLength(ancestral_matches[mI]->Length(1), child_1);
+- cga_list.push_back(make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));
++ cga_list.push_back(boost::tuples::make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));
+ }
+
+ stack<node_id_t> node_stack;