1 |
commit: 968e6a0bcb47baa93568b213a8f4bf5bfd2d2183 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 28 22:47:12 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 28 22:51:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968e6a0b |
7 |
|
8 |
sci-libs/colpack: Allow for compiling with GCC 6 |
9 |
|
10 |
Gentoo-bug: 594388 |
11 |
* EAPI=6 |
12 |
* Delete .la files when USE="-static-libs" |
13 |
|
14 |
Package-Manager: portage-2.3.1 |
15 |
|
16 |
sci-libs/colpack/colpack-1.0.9-r1.ebuild | 57 +++++++++++++++++ |
17 |
sci-libs/colpack/files/colpack-1.0.8-no-bin.patch | 4 +- |
18 |
.../colpack/files/colpack-1.0.9-fix-c++14.patch | 71 ++++++++++++++++++++++ |
19 |
3 files changed, 130 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/colpack/colpack-1.0.9-r1.ebuild b/sci-libs/colpack/colpack-1.0.9-r1.ebuild |
22 |
new file mode 100644 |
23 |
index 00000000..d2555c3 |
24 |
--- /dev/null |
25 |
+++ b/sci-libs/colpack/colpack-1.0.9-r1.ebuild |
26 |
@@ -0,0 +1,57 @@ |
27 |
+# Copyright 1999-2016 Gentoo Foundation |
28 |
+# Distributed under the terms of the GNU General Public License v2 |
29 |
+# $Id$ |
30 |
+ |
31 |
+EAPI=6 |
32 |
+ |
33 |
+inherit autotools toolchain-funcs |
34 |
+ |
35 |
+MY_PN="ColPack" |
36 |
+ |
37 |
+DESCRIPTION="C++ algorithms for specialized vertex coloring problems" |
38 |
+LICENSE="GPL-3 LGPL-3" |
39 |
+HOMEPAGE="http://www.cscapes.org/coloringpage/software.htm" |
40 |
+SRC_URI="http://cscapes.cs.purdue.edu/download/${MY_PN}/${MY_PN}-${PV}.tar.gz" |
41 |
+ |
42 |
+SLOT="0" |
43 |
+IUSE="openmp static-libs" |
44 |
+KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux" |
45 |
+ |
46 |
+RDEPEND="" |
47 |
+DEPEND="${RDEPEND}" |
48 |
+ |
49 |
+S="${WORKDIR}/${MY_PN}-${PV}" |
50 |
+ |
51 |
+PATCHES=( |
52 |
+ "${FILESDIR}/${PN}-1.0.6-flags.patch" |
53 |
+ "${FILESDIR}/${PN}-1.0.8-no-bin.patch" |
54 |
+ "${FILESDIR}/${PN}-1.0.9-fix_gcc49_omp.patch" |
55 |
+ "${FILESDIR}/${PN}-1.0.9-fix-c++14.patch" |
56 |
+) |
57 |
+ |
58 |
+pkg_setup() { |
59 |
+ if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
60 |
+ ewarn "You are using gcc without OpenMP" |
61 |
+ die "Need an OpenMP capable compiler" |
62 |
+ fi |
63 |
+} |
64 |
+ |
65 |
+src_prepare() { |
66 |
+ default |
67 |
+ eautoreconf |
68 |
+} |
69 |
+ |
70 |
+src_configure() { |
71 |
+ econf \ |
72 |
+ --enable-shared \ |
73 |
+ $(use_enable static-libs static) \ |
74 |
+ $(use_enable openmp) |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ default |
79 |
+ |
80 |
+ if ! use static-libs; then |
81 |
+ find "${D}" -name '*.la' -delete || die |
82 |
+ fi |
83 |
+} |
84 |
|
85 |
diff --git a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch |
86 |
index f2400d6..e9230b0 100644 |
87 |
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch |
88 |
+++ b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch |
89 |
@@ -1,8 +1,8 @@ |
90 |
From: Sebastien Fabbro <bicatali@g.o> |
91 |
Avoid installing the ColPack binary on an absolute path |
92 |
|
93 |
---- Makefile.am 2012-03-20 21:37:34.000000000 -0700 |
94 |
-+++ Makefile.am 2012-09-17 14:24:02.168309078 -0700 |
95 |
+--- a/Makefile.am |
96 |
++++ b/Makefile.am |
97 |
@@ -17,8 +17,7 @@ |
98 |
LDADD = libColPack.la |
99 |
AM_DEFAULT_SOURCE_EXT = .cpp |
100 |
|
101 |
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch |
102 |
new file mode 100644 |
103 |
index 00000000..7076be5 |
104 |
--- /dev/null |
105 |
+++ b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch |
106 |
@@ -0,0 +1,71 @@ |
107 |
+From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001 |
108 |
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@××××××××.io> |
109 |
+Date: Wed, 24 Feb 2016 23:26:20 +0100 |
110 |
+Subject: [PATCH] fix semantic errors in error-msgs |
111 |
+ |
112 |
+--- |
113 |
+ Utilities/extra.cpp | 12 +++++------- |
114 |
+ 1 file changed, 5 insertions(+), 7 deletions(-) |
115 |
+ |
116 |
+diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp |
117 |
+index 21862e6..9f59263 100644 |
118 |
+--- a/Utilities/extra.cpp |
119 |
++++ b/Utilities/extra.cpp |
120 |
+@@ -49,7 +49,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
121 |
+ |
122 |
+ ofstream out_Matrix (s_MatrixName.c_str()); |
123 |
+ if(!out_Matrix) { |
124 |
+- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
125 |
++ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
126 |
+ exit(1); |
127 |
+ } |
128 |
+ |
129 |
+@@ -84,7 +84,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
130 |
+ string s_MatrixName = "pattern"+s_postfix+s_BaseName; |
131 |
+ ofstream out_Matrix (s_MatrixName.c_str()); |
132 |
+ if(!out_Matrix) { |
133 |
+- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
134 |
++ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
135 |
+ exit(1); |
136 |
+ } |
137 |
+ |
138 |
+@@ -111,7 +111,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
139 |
+ string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName; |
140 |
+ ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str()); |
141 |
+ if(!out_CompressedMatrix) { |
142 |
+- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl; |
143 |
++ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl; |
144 |
+ exit(1); |
145 |
+ } |
146 |
+ |
147 |
+@@ -140,7 +140,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
148 |
+ string s_MatrixName = "pattern_value"+s_postfix+s_BaseName; |
149 |
+ ofstream out_Matrix (s_MatrixName.c_str()); |
150 |
+ if(!out_Matrix) { |
151 |
+- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
152 |
++ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
153 |
+ exit(1); |
154 |
+ } |
155 |
+ |
156 |
+@@ -167,7 +167,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
157 |
+ string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName; |
158 |
+ ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str()); |
159 |
+ if(!out_CompressedMatrix) { |
160 |
+- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl; |
161 |
++ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl; |
162 |
+ exit(1); |
163 |
+ } |
164 |
+ |
165 |
+@@ -671,7 +671,6 @@ int buildDotWithColor(ColPack::GraphColoringInterface &g, vector<string> &ListOf |
166 |
+ } |
167 |
+ } |
168 |
+ } |
169 |
+- |
170 |
+ } |
171 |
+ } |
172 |
+ } |
173 |
+@@ -1483,4 +1482,3 @@ int DisplayADICFormat_Value(std::list<std::vector<double> > &lvd_Value) { |
174 |
+ } |
175 |
+ |
176 |
+ #endif |
177 |
+- |