1 |
commit: e4e2a2eb17787fe55bdba387688befbaf6fb77fc |
2 |
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Dec 27 12:50:04 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 12:50:04 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e2a2eb |
7 |
|
8 |
sci-biology/vaal: Remove old patches |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
sci-biology/vaal/files/vaal-1.2-as-needed.patch | 22 --- |
13 |
.../vaal/files/vaal-1.2-gcc-x86-no-autocast.patch | 39 ------ |
14 |
.../vaal/files/vaal-1.2-respect-flags.patch | 60 -------- |
15 |
sci-biology/vaal/files/vaal-1.6-gcc47.patch | 153 --------------------- |
16 |
.../vaal/files/vaal-1.6-respect-flags.patch | 12 -- |
17 |
5 files changed, 286 deletions(-) |
18 |
|
19 |
diff --git a/sci-biology/vaal/files/vaal-1.2-as-needed.patch b/sci-biology/vaal/files/vaal-1.2-as-needed.patch |
20 |
deleted file mode 100644 |
21 |
index 3164901..0000000 |
22 |
--- a/sci-biology/vaal/files/vaal-1.2-as-needed.patch |
23 |
+++ /dev/null |
24 |
@@ -1,22 +0,0 @@ |
25 |
---- VAAL.orig/MakeDepend.cc 2008-12-18 17:05:48.000000000 +0100 |
26 |
-+++ VAAL/MakeDepend.cc 2010-02-14 13:42:23.734370178 +0100 |
27 |
-@@ -1195,9 +1195,6 @@ |
28 |
- } |
29 |
- } |
30 |
- mf << " -L. -L$(LIB) -L$(OBJ) $(LINK_LIBS)"; |
31 |
-- for ( set<string>::iterator dep_iter = lib_deps.begin(); |
32 |
-- dep_iter != lib_deps.end(); ++dep_iter ) |
33 |
-- mf << " " << "$(" << *dep_iter << "_LFLAGS)"; |
34 |
- for ( set<string>::iterator dep_iter = sharedlib_deps.begin(); |
35 |
- dep_iter != sharedlib_deps.end(); ++dep_iter ) { |
36 |
- // Extract the symbolic name of this library from its filename. |
37 |
-@@ -1208,6 +1205,9 @@ |
38 |
- mf << " -l" << sharedlib_name; |
39 |
- } |
40 |
- mf << " -l" << libname; |
41 |
-+ for ( set<string>::iterator dep_iter = lib_deps.begin(); |
42 |
-+ dep_iter != lib_deps.end(); ++dep_iter ) |
43 |
-+ mf << " " << "$(" << *dep_iter << "_LFLAGS)"; |
44 |
- mf << "\n\t" << "/bin/rm $(OBJ)/lib" << libname << ".a\n"; |
45 |
- } |
46 |
- } |
47 |
|
48 |
diff --git a/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch b/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch |
49 |
deleted file mode 100644 |
50 |
index c021fad..0000000 |
51 |
--- a/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch |
52 |
+++ /dev/null |
53 |
@@ -1,39 +0,0 @@ |
54 |
-diff -durr VAAL.orig/SortKmersImpl.h VAAL/SortKmersImpl.h |
55 |
---- VAAL.orig/SortKmersImpl.h 2009-11-12 13:02:40.116993289 +0000 |
56 |
-+++ VAAL/SortKmersImpl.h 2009-11-12 13:04:59.416388534 +0000 |
57 |
-@@ -98,7 +98,7 @@ |
58 |
- { if ( reads[l].size( ) < KSPAN ) continue; |
59 |
- unsigned int N = reads[l].size( ) - KSPAN + 1; |
60 |
- if ( S + 2*N >= R.size( ) ) { |
61 |
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) ); |
62 |
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) ); |
63 |
- if ( nn < R.size( ) ) FatalErr( "SortKmers<1>: Unsigned-int overflow (R=" << R.size( ) << ")" ); |
64 |
- R.resize(nn); |
65 |
- } |
66 |
-@@ -180,7 +180,7 @@ |
67 |
- } |
68 |
- if ( q == N ) break; |
69 |
- if ( S + 2*N >= R.size( ) ) { |
70 |
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) ); |
71 |
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) ); |
72 |
- if ( nn < R.size( ) ) FatalErr( "SortKmers<10>: Unsigned-int overflow (R=" << R.size( ) << ")" ); |
73 |
- R.resize(nn); |
74 |
- } |
75 |
-@@ -207,7 +207,7 @@ |
76 |
- top += Min( N - top, (unsigned int) 10000 ); |
77 |
- |
78 |
- if ( S + 20000 >= R.size( ) || S + 2*N >= R.size( ) ) { |
79 |
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) ); |
80 |
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) ); |
81 |
- if ( nn < R.size( ) ) FatalErr( "SortKmers<10>: Unsigned-int overflow (R=" << R.size( ) << ")" ); |
82 |
- R.resize(nn); |
83 |
- } |
84 |
-@@ -318,7 +318,7 @@ |
85 |
- |
86 |
- top += Min( N - top, 10000 ); |
87 |
- if ( S + 2*(top - q) >= R.size( ) ) { |
88 |
-- unsigned nn = Max( (unsigned) ( 1.2 * R.size( ) ), (S + 2*(top - q)) ); |
89 |
-+ unsigned nn = Max( (unsigned) ( 1.2 * R.size( ) ), (unsigned) (S + 2*(top - q)) ); |
90 |
- if ( nn < R.size( ) ) FatalErr( "SortKmers<100>: Unsigned-int overflow (R=" << R.size( ) << ")" ); |
91 |
- R.resize(nn); |
92 |
- } |
93 |
|
94 |
diff --git a/sci-biology/vaal/files/vaal-1.2-respect-flags.patch b/sci-biology/vaal/files/vaal-1.2-respect-flags.patch |
95 |
deleted file mode 100644 |
96 |
index d342055..0000000 |
97 |
--- a/sci-biology/vaal/files/vaal-1.2-respect-flags.patch |
98 |
+++ /dev/null |
99 |
@@ -1,60 +0,0 @@ |
100 |
---- VAAL.orig/Makefile.in 2009-04-02 21:43:42.000000000 +0200 |
101 |
-+++ VAAL/Makefile.in 2010-02-14 14:20:26.222370302 +0100 |
102 |
-@@ -161,12 +161,16 @@ |
103 |
- COMPILER = @CC@ |
104 |
- CPLUSPLUS = @CXX@ |
105 |
- |
106 |
-+CFLAGS = @CFLAGS@ |
107 |
-+CXXFLAGS = @CXXFLAGS@ |
108 |
-+LDFLAGS = @LDFLAGS@ |
109 |
-+ |
110 |
- # QUIET=yes causes the compiler to be less verbose about warnings. |
111 |
- QUIET = no |
112 |
- |
113 |
- # DEBUG=yes forces out-of-date executables to be built with symbolic |
114 |
- # debugging information. Any other value is ignored. |
115 |
--DEBUG = yes |
116 |
-+DEBUG = no |
117 |
- |
118 |
- # OPTIM=<compiler optimization> forces user-defined optimizations to be used, |
119 |
- # rather than the compiler-specific default. |
120 |
-@@ -174,7 +178,7 @@ |
121 |
- # If OPTIM=none, then no optimization is used. |
122 |
- # If unset, defaults are used. |
123 |
- # -fno-exceptions |
124 |
--OPTIM = |
125 |
-+OPTIM = none |
126 |
- |
127 |
- # PROFILE=yes builds sampled-profiling (i.e. gprof) executables. Any other |
128 |
- # value is ignored. |
129 |
-@@ -317,6 +321,7 @@ |
130 |
- # Setup final compilation options: |
131 |
- |
132 |
- CPP_OPTIONS = \ |
133 |
-+ $(CXXFLAGS) \ |
134 |
- $(SYS_WARN) \ |
135 |
- $(SYS_OPT) \ |
136 |
- $(SYS_DEBUG) \ |
137 |
-@@ -328,6 +333,7 @@ |
138 |
- @INCLUDES@ |
139 |
- |
140 |
- LINK_OPTIONS = \ |
141 |
-+ $(LDFLAGS) \ |
142 |
- $(SYS_DEBUG) \ |
143 |
- $(SYS_LINK) \ |
144 |
- $(OMP_LINK) \ |
145 |
-@@ -406,12 +406,12 @@ |
146 |
- $(CPLUSPLUS) $(CPPO) $(CPPC) $(SYS_LANG) $(MAKEDEPEND_OPTS) -o $(BIN)/MakeDepend $(SRC)/MakeDepend.cc |
147 |
- |
148 |
- checkLock: $(SRC)/util/checkLock.cc |
149 |
-- $(CPLUSPLUS) $(SRC)/util/checkLock.cc -o $(BIN)/checkLock |
150 |
-+ $(CPLUSPLUS) $(CXXFLAGS) $(SRC)/util/checkLock.cc $(LDFLAGS) -o $(BIN)/checkLock |
151 |
- |
152 |
- random/Random.o: random/Random.cc |
153 |
- @ mkdir -p $(OBJ)/${@D} |
154 |
- cp $(SRC)/random/Random.cc $(SRC)/random/Random.c |
155 |
-- $(CC) $(SYS_LANG) -c $(SRC)/random/Random.cc -w -Drandom=randomx -Dsrandom=srandomx -o $(OBJ)/random/Random.o |
156 |
-+ $(CC) $(CFLAGS) $(SYS_LANG) -c $(SRC)/random/Random.cc -w -Drandom=randomx -Dsrandom=srandomx -o $(OBJ)/random/Random.o |
157 |
- rm $(SRC)/random/Random.c |
158 |
- |
159 |
- MemTracker.o: MemTracker.cc |
160 |
|
161 |
diff --git a/sci-biology/vaal/files/vaal-1.6-gcc47.patch b/sci-biology/vaal/files/vaal-1.6-gcc47.patch |
162 |
deleted file mode 100644 |
163 |
index 0d80f08..0000000 |
164 |
--- a/sci-biology/vaal/files/vaal-1.6-gcc47.patch |
165 |
+++ /dev/null |
166 |
@@ -1,153 +0,0 @@ |
167 |
-Fix building with gcc-4.7 |
168 |
- |
169 |
-https://bugs.gentoo.org/show_bug.cgi?id=423497 |
170 |
- |
171 |
-Patch written by Kacper Kowalik <xarthisius@g.o> |
172 |
---- a/src/feudal/MasterVec.h |
173 |
-+++ b/src/feudal/MasterVec.h |
174 |
-@@ -62,20 +62,20 @@ |
175 |
- /// This function is deprecated: Use reserve() instead. |
176 |
- /// The pool size argument is ignored, anyway. |
177 |
- MasterVec& Reserve( unsigned long raw_mem_size_ignored, size_type capacity ) |
178 |
-- { reserve(capacity); return *this; } |
179 |
-+ { this->reserve(capacity); return *this; } |
180 |
- |
181 |
- /// This function is deprecated: Use clear().shrink_to_fit(). |
182 |
- MasterVec& destroy() { BaseT::clear(); BaseT::shrink_to_fit(); return *this; } |
183 |
- |
184 |
- /// This function is deprecated: Use push_back(). |
185 |
- MasterVec& push_back_external( T const& val ) |
186 |
-- { push_back(val); return *this; } |
187 |
-+ { this->push_back(val); return *this; } |
188 |
- |
189 |
- /// This function is deprecated: Use push_back(). |
190 |
- MasterVec& push_back_reserve( T const& val, |
191 |
- size_type growthIncr = 0, |
192 |
- float growthFact = 1.3f ) |
193 |
-- { push_back(val,growthFact,growthIncr); return *this; } |
194 |
-+ { this->push_back(val,growthFact,growthIncr); return *this; } |
195 |
- |
196 |
- /// This function is deprecated: Use append(). |
197 |
- MasterVec& Append( MasterVec const& that ) |
198 |
-@@ -83,7 +83,7 @@ |
199 |
- |
200 |
- /// This function is deprecated: Use append(). |
201 |
- MasterVec& Append( MasterVec const& that, size_type from, size_type to ) |
202 |
-- { append(that.begin(from),that.begin(to)); return *this; } |
203 |
-+ { this->append(that.begin(from),that.begin(to)); return *this; } |
204 |
- |
205 |
- MasterVec const& WriteAll( String const& fileName ) const |
206 |
- { return WriteRange(fileName,0UL,BaseT::size()); return *this; } |
207 |
-@@ -108,7 +108,7 @@ |
208 |
- { if ( !append ) BaseT::clear(); |
209 |
- FeudalFileReader rdr(fileName.c_str()); |
210 |
- size_type siz = rdr.getNElements(); |
211 |
-- reserve(BaseT::size()+siz); |
212 |
-+ this->reserve(BaseT::size()+siz); |
213 |
- preAlloc(rdr,0,siz); |
214 |
- for ( size_type iii = 0; iii < siz; ++iii ) |
215 |
- appendFromReader(rdr,iii); |
216 |
---- a/src/feudal/FeudalControlBlock.cc |
217 |
-+++ b/src/feudal/FeudalControlBlock.cc |
218 |
-@@ -24,6 +24,7 @@ |
219 |
- #include <string.h> |
220 |
- #include <errno.h> |
221 |
- #include <iostream> |
222 |
-+#include <unistd.h> |
223 |
- |
224 |
- using std::cout; |
225 |
- using std::endl; |
226 |
---- a/src/feudal/SerfVec.h |
227 |
-+++ b/src/feudal/SerfVec.h |
228 |
-@@ -83,9 +83,9 @@ |
229 |
- { AssertLe(pos,that.size()); |
230 |
- AssertLe(len,that.size()-pos); |
231 |
- if ( this != &that ) |
232 |
-- { assign(that.begin(pos),that.begin(pos+len)); } |
233 |
-+ { this->assign(that.begin(pos),that.begin(pos+len)); } |
234 |
- else |
235 |
-- { erase(BaseT::begin(),BaseT::begin(pos)); |
236 |
-+ { this->erase(BaseT::begin(),BaseT::begin(pos)); |
237 |
- BaseT::resize(len); } |
238 |
- return *this; } |
239 |
- |
240 |
---- a/src/system/ProcBuf.cc |
241 |
-+++ b/src/system/ProcBuf.cc |
242 |
-@@ -195,12 +195,12 @@ |
243 |
- Assert(M_internal_put_buffer == NULL); |
244 |
- M_internal_put_buffer = new char_type [DEFAULT_PUT_BUFFER_SIZE]; |
245 |
- M_internal_put_buffer_end = M_internal_put_buffer+DEFAULT_PUT_BUFFER_SIZE; |
246 |
-- setp(M_internal_put_buffer, |
247 |
-+ this->setp(M_internal_put_buffer, |
248 |
- M_internal_put_buffer_end); |
249 |
- } else if (!flush()) |
250 |
- return traits_type::eof(); |
251 |
- if (!traits_type::eq_int_type(c, traits_type::eof())) |
252 |
-- return sputc(c); |
253 |
-+ return this->sputc(c); |
254 |
- else |
255 |
- return traits_type::not_eof(c); |
256 |
- } |
257 |
-@@ -240,7 +240,7 @@ |
258 |
- // (which is start of buffer) |
259 |
- std::copy_backward(this->eback(), this->egptr(), this->egptr()+1); |
260 |
- *(this->gptr()) = traits_type::to_char_type(c); |
261 |
-- setg(this->eback(), this->gptr(), this->egptr()+1); |
262 |
-+ this->setg(this->eback(), this->gptr(), this->egptr()+1); |
263 |
- return traits_type::not_eof(c); |
264 |
- } else |
265 |
- return traits_type::eof(); |
266 |
-@@ -269,7 +269,7 @@ |
267 |
- // doing wchars and we write an odd # of bytes? |
268 |
- return false; |
269 |
- } else { |
270 |
-- setp(this->pbase(), this->epptr()); |
271 |
-+ this->setp(this->pbase(), this->epptr()); |
272 |
- return true; |
273 |
- } |
274 |
- } |
275 |
-@@ -283,7 +283,7 @@ |
276 |
- Assert(M_internal_get_buffer == NULL); |
277 |
- M_internal_get_buffer = new char_type[DEFAULT_GET_BUFFER_SIZE]; |
278 |
- M_internal_get_buffer_end = M_internal_get_buffer + DEFAULT_GET_BUFFER_SIZE; |
279 |
-- setg(M_internal_get_buffer, M_internal_get_buffer_end, M_internal_get_buffer_end); |
280 |
-+ this->setg(M_internal_get_buffer, M_internal_get_buffer_end, M_internal_get_buffer_end); |
281 |
- } |
282 |
- // The "get" pointer should be at the end of the buffer - that's |
283 |
- // why we need to fill it. |
284 |
-@@ -318,7 +318,7 @@ |
285 |
- // |
286 |
- // reset the get pointers |
287 |
- // |
288 |
-- setg(M_internal_get_buffer, |
289 |
-+ this->setg(M_internal_get_buffer, |
290 |
- M_internal_get_buffer, |
291 |
- M_internal_get_buffer+numusable/sizeof(char_type)); |
292 |
- return true; |
293 |
---- a/src/system/SysConf.cc |
294 |
-+++ b/src/system/SysConf.cc |
295 |
-@@ -19,6 +19,7 @@ |
296 |
- #include "system/SysConf.h" |
297 |
- #include "system/Exit.h" |
298 |
- #include <iostream> |
299 |
-+#include <unistd.h> |
300 |
- |
301 |
- namespace |
302 |
- { |
303 |
---- a/src/Vec.h |
304 |
-+++ b/src/Vec.h |
305 |
-@@ -261,11 +261,11 @@ |
306 |
- |
307 |
- template <class U> |
308 |
- void append( const vec<U>& y ) |
309 |
-- { insert( this->end( ), y.begin( ), y.end( ) ); } |
310 |
-+ { this->insert( this->end( ), y.begin( ), y.end( ) ); } |
311 |
- |
312 |
- void append( const vec<T>& y, size_type i, size_type j ) { |
313 |
-- if ( j == y.size( ) ) insert( this->end( ), y.begin( ) + i, y.end( ) ); |
314 |
-- else insert( this->end( ), y.begin( ) + i, y.begin( ) + j ); |
315 |
-+ if ( j == y.size( ) ) this->insert( this->end( ), y.begin( ) + i, y.end( ) ); |
316 |
-+ else this->insert( this->end( ), y.begin( ) + i, y.begin( ) + j ); |
317 |
- } |
318 |
- |
319 |
- // appends values in y, but only those whose indices are in entries |
320 |
|
321 |
diff --git a/sci-biology/vaal/files/vaal-1.6-respect-flags.patch b/sci-biology/vaal/files/vaal-1.6-respect-flags.patch |
322 |
deleted file mode 100644 |
323 |
index 152fb42..0000000 |
324 |
--- a/sci-biology/vaal/files/vaal-1.6-respect-flags.patch |
325 |
+++ /dev/null |
326 |
@@ -1,12 +0,0 @@ |
327 |
-diff -dur vaal-33805.orig/configure.ac vaal-33805/configure.ac |
328 |
---- vaal-33805.orig/configure.ac 2010-09-20 04:37:49.858059826 +0000 |
329 |
-+++ vaal-33805/configure.ac 2010-09-20 04:39:41.178059477 +0000 |
330 |
-@@ -14,7 +14,7 @@ |
331 |
- AC_OPENMP |
332 |
- AC_OPENMP_CEHCK |
333 |
- |
334 |
--CXXFLAGS=" -imacros config.h -Wextra -Wall -Wno-unused -ansi -pedantic -Wno-long-long -Wsign-promo -Woverloaded-virtual -Wendif-labels -O3 -ggdb3 -ftemplate-depth-50 -Wno-deprecated -Wno-parentheses -fno-strict-aliasing -mieee-fp -iquote ." |
335 |
-+CXXFLAGS+=" -imacros config.h -Wextra -Wall -Wno-unused -ansi -pedantic -Wno-long-long -Wsign-promo -Woverloaded-virtual -Wendif-labels -ftemplate-depth-50 -Wno-deprecated -Wno-parentheses -fno-strict-aliasing -mieee-fp -iquote ." |
336 |
- |
337 |
- OS_RELEASE="`uname -r`" |
338 |
- AC_SUBST(CXXFLAGS) |