Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libcmatrix/, sci-libs/libcmatrix/files/
Date: Mon, 26 Oct 2015 13:36:06
Message-Id: 1445866545.2a9385480fd3227390375059d639f2f52aca24a8.jlec@gentoo
1 commit: 2a9385480fd3227390375059d639f2f52aca24a8
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 11:10:46 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 13:35:45 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a938548
7
8 sci-libs/libcmatrix: Fix for gcc-5
9
10 Package-Manager: portage-2.2.23
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch | 16 ++++++++++++++++
14 sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild | 1 +
15 2 files changed, 17 insertions(+)
16
17 diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch
18 new file mode 100644
19 index 0000000..d5d4024
20 --- /dev/null
21 +++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch
22 @@ -0,0 +1,16 @@
23 + include/MultiMatrix.h | 2 +-
24 + 1 file changed, 1 insertion(+), 1 deletion(-)
25 +
26 +diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h
27 +index 2d54db5..e95ce4c 100755
28 +--- a/include/MultiMatrix.h
29 ++++ b/include/MultiMatrix.h
30 +@@ -1225,7 +1225,7 @@ template<class T,size_t N> struct new_trait_<T,N,N> { typedef MultiMatrix<T,N> v
31 + #endif
32 + //LCM_SUPPRESS_VIEWS
33 +
34 +- template<size_t N, template<size_t> class CheckClass =LCM_CheckBoundsDefault>
35 ++ template<size_t N, template<size_t> class CheckClass>
36 + class Indexer<N,CheckClass>::permuted_iterator : public ::std::iterator< ::std::bidirectional_iterator_tag,size_t>
37 + {
38 + private:
39
40 diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
41 index 84ec50c..e4b2694 100644
42 --- a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
43 +++ b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
44 @@ -34,6 +34,7 @@ PATCHES=(
45 "${FILESDIR}"/3.2.1-gcc4.6.patch
46 "${FILESDIR}"/3.2.1-gcc4.7.patch
47 "${FILESDIR}"/3.9.0-atlas.patch
48 + "${FILESDIR}"/${P}-gcc5.2.patch
49 )
50
51 AUTOTOOLS_IN_SOURCE_BUILD=1