1 |
commit: a88d67480723e9230a4e20a555c1177a04644868 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 25 23:30:13 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 25 23:30:46 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88d6748 |
7 |
|
8 |
sci-libs/libcmatrix: Allow for compiling with GCC 6 |
9 |
|
10 |
Gentoo-bug: 594680 |
11 |
* EAPI=6 |
12 |
* Make PATCHES -p1 compliant |
13 |
* Rename PATCHES to be in ${P}-xyz.patch format |
14 |
|
15 |
Package-Manager: portage-2.3.1 |
16 |
|
17 |
.../files/libcmatrix-3.11.0-fix-c++14.patch | 40 ++++++++++++++++++++++ |
18 |
...shared.patch => libcmatrix-3.11.0-shared.patch} | 0 |
19 |
....1-atlas.patch => libcmatrix-3.2.1-atlas.patch} | 0 |
20 |
...-gcc4.4.patch => libcmatrix-3.2.1-gcc4.4.patch} | 0 |
21 |
...-gcc4.6.patch => libcmatrix-3.2.1-gcc4.6.patch} | 0 |
22 |
...-gcc4.7.patch => libcmatrix-3.2.1-gcc4.7.patch} | 0 |
23 |
...inuit2.patch => libcmatrix-3.2.1-minuit2.patch} | 4 +-- |
24 |
...-shared.patch => libcmatrix-3.2.1-shared.patch} | 0 |
25 |
....0-atlas.patch => libcmatrix-3.9.0-atlas.patch} | 0 |
26 |
...x-3.11.0.ebuild => libcmatrix-3.11.0-r1.ebuild} | 40 ++++++++++++---------- |
27 |
10 files changed, 63 insertions(+), 21 deletions(-) |
28 |
|
29 |
diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch |
30 |
new file mode 100644 |
31 |
index 00000000..74e4928 |
32 |
--- /dev/null |
33 |
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch |
34 |
@@ -0,0 +1,40 @@ |
35 |
+Fix building with C++14, which errors out due -Wnarrowing conversions. |
36 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594680 |
37 |
+ |
38 |
+--- a/include/lcm_ssecomplex.h |
39 |
++++ b/include/lcm_ssecomplex.h |
40 |
+@@ -151,7 +151,7 @@ |
41 |
+ { |
42 |
+ static const union { |
43 |
+ int i[4]; ssecomplex_t v; |
44 |
+- } signbithigh = {{0,0,0,0x80000000}}; |
45 |
++ } signbithigh = {{0,0,0,(int)0x80000000}}; |
46 |
+ ssecomplex_t b_im = _mm_shuffle_pd(b,b,3); // Imag. part of b in both |
47 |
+ const ssecomplex_t b_re = _mm_shuffle_pd(b,b,0); // Real part of b in both |
48 |
+ const ssecomplex_t tmp=_mm_mul_pd(a,b_re); |
49 |
+@@ -166,7 +166,7 @@ |
50 |
+ ssecomplex_t b_re = _mm_set1_pd(b); |
51 |
+ static const union { |
52 |
+ int i[4]; ssecomplex_t v; |
53 |
+- } signbithigh = {{0,0,0,0x80000000}}; |
54 |
++ } signbithigh = {{0,0,0,(int)0x80000000}}; |
55 |
+ b_re = _mm_xor_pd(b_re, signbithigh.v); // Change sign of high |
56 |
+ return complex(_mm_mul_pd(a.z_, b_re)); |
57 |
+ } |
58 |
+@@ -184,14 +184,14 @@ |
59 |
+ inline complex operator- (const complex& a) { |
60 |
+ static const union { // (signbit,signbit) |
61 |
+ int i[4]; ssecomplex_t v; |
62 |
+- } signbits = {{0,0x80000000,0,0x80000000}}; |
63 |
++ } signbits = {{0,(int)0x80000000,0,(int)0x80000000}}; |
64 |
+ return complex(_mm_xor_pd(a, signbits.v)); // Change sign of both elements |
65 |
+ } |
66 |
+ |
67 |
+ inline complex conj(const complex& a) { |
68 |
+ static const union { // (signbit,signbit) |
69 |
+ int i[4]; ssecomplex_t v; |
70 |
+- } signbithigh = {{0,0,0,0x80000000}}; |
71 |
++ } signbithigh = {{0,0,0,(int)0x80000000}}; |
72 |
+ return complex(_mm_xor_pd(a.z_, signbithigh.v)); // Change sign of imag. part |
73 |
+ } |
74 |
+ |
75 |
|
76 |
diff --git a/sci-libs/libcmatrix/files/3.11.0-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch |
77 |
similarity index 100% |
78 |
rename from sci-libs/libcmatrix/files/3.11.0-shared.patch |
79 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch |
80 |
|
81 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch |
82 |
similarity index 100% |
83 |
rename from sci-libs/libcmatrix/files/3.2.1-atlas.patch |
84 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch |
85 |
|
86 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch |
87 |
similarity index 100% |
88 |
rename from sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch |
89 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch |
90 |
|
91 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch |
92 |
similarity index 100% |
93 |
rename from sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch |
94 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch |
95 |
|
96 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch |
97 |
similarity index 100% |
98 |
rename from sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch |
99 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch |
100 |
|
101 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch |
102 |
similarity index 77% |
103 |
rename from sci-libs/libcmatrix/files/3.2.1-minuit2.patch |
104 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch |
105 |
index 24dc562..e7a6cec 100644 |
106 |
--- a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch |
107 |
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch |
108 |
@@ -1,5 +1,5 @@ |
109 |
---- configure-libraries.ac 2008-03-04 00:48:46.000000000 +0100 |
110 |
-+++ configure-libraries.ac.new 2009-03-19 18:22:21.000000000 +0100 |
111 |
+--- a/configure-libraries.ac |
112 |
++++ b/configure-libraries.ac |
113 |
@@ -14,8 +14,8 @@ |
114 |
fi |
115 |
if test x$FOUNDMINUIT = xyes; then |
116 |
|
117 |
diff --git a/sci-libs/libcmatrix/files/3.2.1-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch |
118 |
similarity index 100% |
119 |
rename from sci-libs/libcmatrix/files/3.2.1-shared.patch |
120 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch |
121 |
|
122 |
diff --git a/sci-libs/libcmatrix/files/3.9.0-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch |
123 |
similarity index 100% |
124 |
rename from sci-libs/libcmatrix/files/3.9.0-atlas.patch |
125 |
rename to sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch |
126 |
|
127 |
diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild |
128 |
similarity index 56% |
129 |
rename from sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild |
130 |
rename to sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild |
131 |
index e4b2694..1393374 100644 |
132 |
--- a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild |
133 |
+++ b/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild |
134 |
@@ -1,18 +1,15 @@ |
135 |
-# Copyright 1999-2015 Gentoo Foundation |
136 |
+# Copyright 1999-2016 Gentoo Foundation |
137 |
# Distributed under the terms of the GNU General Public License v2 |
138 |
# $Id$ |
139 |
|
140 |
-EAPI=5 |
141 |
+EAPI=6 |
142 |
|
143 |
-AUTOTOOLS_AUTORECONF=true |
144 |
- |
145 |
-inherit autotools-utils |
146 |
+inherit autotools |
147 |
|
148 |
MY_P="${PN}${PV}_lite" |
149 |
|
150 |
DESCRIPTION="lite version of pNMRsim" |
151 |
HOMEPAGE="http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/" |
152 |
-#SRC_URI="${HOMEPAGE}/${MY_P}.tar.gz" |
153 |
SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz" |
154 |
|
155 |
LICENSE="all-rights-reserved" |
156 |
@@ -25,19 +22,24 @@ DEPEND="${RDEPEND}" |
157 |
|
158 |
RESTRICT=mirror |
159 |
|
160 |
-S="${WORKDIR}"/${PN}R3 |
161 |
+S="${WORKDIR}/${PN}R3" |
162 |
|
163 |
+DOCS=( CHANGES docs/cmatrix.pdf ) |
164 |
PATCHES=( |
165 |
- "${FILESDIR}"/${PV}-shared.patch |
166 |
- "${FILESDIR}"/3.2.1-minuit2.patch |
167 |
- "${FILESDIR}"/3.2.1-gcc4.4.patch |
168 |
- "${FILESDIR}"/3.2.1-gcc4.6.patch |
169 |
- "${FILESDIR}"/3.2.1-gcc4.7.patch |
170 |
- "${FILESDIR}"/3.9.0-atlas.patch |
171 |
- "${FILESDIR}"/${P}-gcc5.2.patch |
172 |
- ) |
173 |
- |
174 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
175 |
+ "${FILESDIR}/${PN}-3.11.0-shared.patch" |
176 |
+ "${FILESDIR}/${PN}-3.2.1-minuit2.patch" |
177 |
+ "${FILESDIR}/${PN}-3.2.1-gcc4.4.patch" |
178 |
+ "${FILESDIR}/${PN}-3.2.1-gcc4.6.patch" |
179 |
+ "${FILESDIR}/${PN}-3.2.1-gcc4.7.patch" |
180 |
+ "${FILESDIR}/${PN}-3.9.0-atlas.patch" |
181 |
+ "${FILESDIR}/${PN}-3.11.0-gcc5.2.patch" |
182 |
+ "${FILESDIR}/${PN}-3.11.0-fix-c++14.patch" |
183 |
+) |
184 |
+ |
185 |
+src_prepare() { |
186 |
+ default |
187 |
+ eautoreconf |
188 |
+} |
189 |
|
190 |
src_configure() { |
191 |
econf \ |
192 |
@@ -52,7 +54,7 @@ src_install() { |
193 |
dolib.so lib/*.so* |
194 |
|
195 |
insinto /usr/include/${PN}R3 |
196 |
- doins include/* |
197 |
+ doins -r include/. |
198 |
|
199 |
- dodoc CHANGES docs/* |
200 |
+ einstalldocs |
201 |
} |