1 |
commit: 5be3396bbda2c7e75d6cc7fb85e359f9576b4e45 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 22:19:54 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 2 22:19:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be3396b |
7 |
|
8 |
sci-libs/hdf5: Drop vulnerable versions for CVE-2016-4330 |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604386 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
14 |
|
15 |
sci-libs/hdf5/Manifest | 3 - |
16 |
sci-libs/hdf5/files/hdf5-1.8.10-buildsystem.patch | 33 ------- |
17 |
sci-libs/hdf5/files/hdf5-1.8.10-comments.patch | 42 --------- |
18 |
sci-libs/hdf5/files/hdf5-1.8.10-implicits.patch | 54 ----------- |
19 |
sci-libs/hdf5/files/hdf5-1.8.10_p1-comments.patch | 29 ------ |
20 |
sci-libs/hdf5/files/hdf5-1.8.13-implicits.patch | 35 ------- |
21 |
sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch | 55 ----------- |
22 |
sci-libs/hdf5/files/hdf5-1.8.14-ldflags.patch | 20 ---- |
23 |
sci-libs/hdf5/files/hdf5-1.8.8-array_bounds.patch | 22 ----- |
24 |
sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch | 33 ------- |
25 |
sci-libs/hdf5/files/hdf5-1.8.8-implicits.patch | 85 ----------------- |
26 |
sci-libs/hdf5/files/hdf5-1.8.9-implicits.patch | 55 ----------- |
27 |
sci-libs/hdf5/files/mpd.conf | 2 - |
28 |
sci-libs/hdf5/hdf5-1.8.14-r1.ebuild | 105 --------------------- |
29 |
sci-libs/hdf5/hdf5-1.8.15_p1.ebuild | 104 -------------------- |
30 |
sci-libs/hdf5/hdf5-1.8.17.ebuild | 110 ---------------------- |
31 |
16 files changed, 787 deletions(-) |
32 |
|
33 |
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest |
34 |
index 72b6e9a..a988c49 100644 |
35 |
--- a/sci-libs/hdf5/Manifest |
36 |
+++ b/sci-libs/hdf5/Manifest |
37 |
@@ -1,4 +1 @@ |
38 |
-DIST hdf5-1.8.14.tar.bz2 9503743 SHA256 53722cb9f5977af2908f92fc1a3f8c597800a5cb448cfe5c75060d6335bb9bab SHA512 c4f0bb01df7bef9cd29c42ec2e27f4bd27c3e059cf18f1285c583e92b94ef799f8a29ec85c17bab12e47a69626851fbda4b8d74543266b01aa2cffc42cde4fea WHIRLPOOL 646d44d446e2bd2855567046ca00f302e02d39880a77f2d75fd6231ad74692c07910c8670ffa5e02f2922e4e28c5a4afd06f907ac5950615dd328c3e7346f578 |
39 |
-DIST hdf5-1.8.15-patch1.tar.bz2 10006036 SHA256 a5afc630c4443547fff15e9637b5b10404adbed4c00206d89517d32d6668fb32 SHA512 380c06f3cab469351d6ddc940c7cdffd5bd20a74e69cb4d549989bec5f130dadae11c04928ead7eea0200a175fc45a042d068a752d8a9c19a35c3a6912a147bd WHIRLPOOL 0c4c918eea3b70a2c4dea2098f24ddb612af6bf026749144dae19380f60de9d4123acd3c4bf324a1a313e4fae1d7874de48afd9e6720bbcc3c4f1fb1c1bc0288 |
40 |
-DIST hdf5-1.8.17.tar.bz2 10030234 SHA256 fc35dd8fd8d398de6b525b27cc111c21fc79795ad6db1b1f12cb15ed1ee8486a SHA512 b0fe630b98a83470c48443215b7073fd22c4390cc459127a4c9554682ae8aec215017c7f34adb8494da4b31fabe6580e9d1b63eddb949432d595e99705c0bbd1 WHIRLPOOL 64e508df74aca518be918dbac10db653004f254779e413ee501a7d550892e6baaa56a0891af28a88d419fa06aa3b06a3c213f45e99b7e2bafc7a9d98e9fe4337 |
41 |
DIST hdf5-1.8.18.tar.bz2 10081294 SHA256 01c6deadf4211f86922400da82c7a8b5b50dc8fc1ce0b5912de3066af316a48c SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2 WHIRLPOOL c1ea97aa30ded9f3129edf47cfda3b7e371aa21fcb2fc409005818f69ed0f0ac41a19e28ec38a5da2c417ef98033f197292169c88f7db81dd94244b016ab2595 |
42 |
|
43 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.10-buildsystem.patch b/sci-libs/hdf5/files/hdf5-1.8.10-buildsystem.patch |
44 |
deleted file mode 100644 |
45 |
index 58bcc50..00000000 |
46 |
--- a/sci-libs/hdf5/files/hdf5-1.8.10-buildsystem.patch |
47 |
+++ /dev/null |
48 |
@@ -1,33 +0,0 @@ |
49 |
-Prevent build system with messing up LD_LIBRARY_PATH |
50 |
- |
51 |
---- a/configure.ac |
52 |
-+++ b/configure.ac |
53 |
-@@ -2331,8 +2331,6 @@ AC_TRY_COMPILE(,[ |
54 |
- ## |
55 |
- AC_MSG_CHECKING([how to print long long]) |
56 |
- AC_CACHE_VAL([hdf5_cv_printf_ll], [ |
57 |
--LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" |
58 |
--export LD_LIBRARY_PATH |
59 |
- |
60 |
- for hdf5_cv_printf_ll in l ll L q unknown; do |
61 |
- AC_TRY_RUN([ |
62 |
---- a/src/Makefile.am |
63 |
-+++ b/src/Makefile.am |
64 |
-@@ -125,8 +125,6 @@ settings_DATA=libhdf5.settings |
65 |
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore |
66 |
- # is set to ignore the error. |
67 |
- H5Tinit.c: H5detect$(EXEEXT) |
68 |
-- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ |
69 |
-- sed -e 's/-L/:/g' -e 's/ //g'`" \ |
70 |
- $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ |
71 |
- (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ |
72 |
- ($(RM) $@ ; exit 1) |
73 |
-@@ -137,8 +135,6 @@ H5Tinit.c: H5detect$(EXEEXT) |
74 |
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore |
75 |
- # is set to ignore the error. |
76 |
- H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings |
77 |
-- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ |
78 |
-- sed -e 's/-L/:/g' -e 's/ //g'`" \ |
79 |
- $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \ |
80 |
- (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ |
81 |
- ($(RM) $@ ; exit 1) |
82 |
|
83 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch b/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch |
84 |
deleted file mode 100644 |
85 |
index 845bd81..00000000 |
86 |
--- a/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch |
87 |
+++ /dev/null |
88 |
@@ -1,42 +0,0 @@ |
89 |
-Convert // comment marks to /**/ in order to fix FTBS on ia64 |
90 |
- |
91 |
-https://bugs.gentoo.org/show_bug.cgi?id=447740 |
92 |
- |
93 |
-Patch written by Kacper Kowalik <xarthisius@g.o> |
94 |
---- a/test/th5s.c |
95 |
-+++ b/test/th5s.c |
96 |
-@@ -730,8 +730,8 @@ test_h5s_zero_dim(void) |
97 |
- ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims); |
98 |
- CHECK(ret, FAIL, "H5Pset_chunk"); |
99 |
- |
100 |
-- // ret = H5Pset_alloc_time(plist_id, alloc_time); |
101 |
-- // CHECK(ret, FAIL, "H5Pset_alloc_time"); |
102 |
-+ /* ret = H5Pset_alloc_time(plist_id, alloc_time); |
103 |
-+ CHECK(ret, FAIL, "H5Pset_alloc_time"); */ |
104 |
- |
105 |
- dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT); |
106 |
- CHECK(dset1, FAIL, "H5Dcreate2"); |
107 |
---- a/tools/h5dump/h5dump_ddl.c |
108 |
-+++ b/tools/h5dump/h5dump_ddl.c |
109 |
-@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe |
110 |
- string_dataformat.do_escape = display_escape; |
111 |
- outputformat = &string_dataformat; |
112 |
- |
113 |
-- //attr_name = attr + j + 1; |
114 |
-- // need to replace escape characters |
115 |
-+ /* attr_name = attr + j + 1; */ |
116 |
-+ /* need to replace escape characters */ |
117 |
- attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/"); |
118 |
- |
119 |
- |
120 |
---- a/tools/lib/h5tools_str.c |
121 |
-+++ b/tools/lib/h5tools_str.c |
122 |
-@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, |
123 |
- h5tools_str_append(str, "%s", OPT(info->line_indent, "")); |
124 |
- } |
125 |
- |
126 |
--// ctx->need_prefix = 0; |
127 |
-+ /* ctx->need_prefix = 0; */ |
128 |
- } |
129 |
- |
130 |
- /*------------------------------------------------------------------------- |
131 |
|
132 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.10-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.10-implicits.patch |
133 |
deleted file mode 100644 |
134 |
index a0b59b7..00000000 |
135 |
--- a/sci-libs/hdf5/files/hdf5-1.8.10-implicits.patch |
136 |
+++ /dev/null |
137 |
@@ -1,54 +0,0 @@ |
138 |
---- a/configure.ac |
139 |
-+++ b/configure.ac |
140 |
-@@ -1494,6 +1494,9 @@ case "$host_cpu-$host_vendor-$host_os" in |
141 |
- ## however, we do not do this since it breaks the big test on some |
142 |
- ## older platforms. |
143 |
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" |
144 |
-+ |
145 |
-+ dnl _GNU_SOURCE is needed for vasprintf |
146 |
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" |
147 |
- ;; |
148 |
- esac |
149 |
- |
150 |
---- a/hl/src/H5LTanalyze.c |
151 |
-+++ b/hl/src/H5LTanalyze.c |
152 |
-@@ -49,6 +49,7 @@ |
153 |
- #define YY_FLEX_MINOR_VERSION 5 |
154 |
- |
155 |
- #include <stdio.h> |
156 |
-+#include "H5pubconf.h" |
157 |
- #ifdef H5_HAVE_UNISTD_H |
158 |
- #include <unistd.h> |
159 |
- #endif |
160 |
---- a/test/cache_common.h |
161 |
-+++ b/test/cache_common.h |
162 |
-@@ -702,5 +702,9 @@ void validate_mdc_config(hid_t file_id, |
163 |
- hbool_t compare_init, |
164 |
- int test_num); |
165 |
- |
166 |
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, |
167 |
-+ const H5C_auto_size_ctl_t *b, |
168 |
-+ hbool_t compare_init); |
169 |
-+ |
170 |
- #endif /* _CACHE_COMMON_H */ |
171 |
- |
172 |
---- a/tools/h5repack/testh5repack_detect_szip.c |
173 |
-+++ b/tools/h5repack/testh5repack_detect_szip.c |
174 |
-@@ -18,6 +18,7 @@ |
175 |
- #include "h5tools.h" |
176 |
- #include "h5tools_utils.h" |
177 |
- #include "h5test.h" |
178 |
-+#include "h5tools_utils.h" |
179 |
- |
180 |
- |
181 |
- /* Name of tool */ |
182 |
---- a/tools/misc/talign.c |
183 |
-+++ b/tools/misc/talign.c |
184 |
-@@ -23,6 +23,7 @@ |
185 |
- |
186 |
- #include "hdf5.h" |
187 |
- #include "H5private.h" |
188 |
-+#include "h5tools.h" |
189 |
- |
190 |
- const char *fname = "talign.h5"; |
191 |
- const char *setname = "align"; |
192 |
|
193 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.10_p1-comments.patch b/sci-libs/hdf5/files/hdf5-1.8.10_p1-comments.patch |
194 |
deleted file mode 100644 |
195 |
index 44af808..00000000 |
196 |
--- a/sci-libs/hdf5/files/hdf5-1.8.10_p1-comments.patch |
197 |
+++ /dev/null |
198 |
@@ -1,29 +0,0 @@ |
199 |
-Convert // comment marks to /**/ in order to fix FTBS on ia64 |
200 |
- |
201 |
-https://bugs.gentoo.org/show_bug.cgi?id=447740 |
202 |
- |
203 |
-Patch written by Kacper Kowalik <xarthisius@g.o> |
204 |
---- a/tools/h5dump/h5dump_ddl.c |
205 |
-+++ b/tools/h5dump/h5dump_ddl.c |
206 |
-@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe |
207 |
- string_dataformat.do_escape = display_escape; |
208 |
- outputformat = &string_dataformat; |
209 |
- |
210 |
-- //attr_name = attr + j + 1; |
211 |
-- // need to replace escape characters |
212 |
-+ /* attr_name = attr + j + 1; */ |
213 |
-+ /* need to replace escape characters */ |
214 |
- attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/"); |
215 |
- |
216 |
- |
217 |
---- a/tools/lib/h5tools_str.c |
218 |
-+++ b/tools/lib/h5tools_str.c |
219 |
-@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, |
220 |
- h5tools_str_append(str, "%s", OPT(info->line_indent, "")); |
221 |
- } |
222 |
- |
223 |
--// ctx->need_prefix = 0; |
224 |
-+ /* ctx->need_prefix = 0; */ |
225 |
- } |
226 |
- |
227 |
- /*------------------------------------------------------------------------- |
228 |
|
229 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.13-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.13-implicits.patch |
230 |
deleted file mode 100644 |
231 |
index 2061d16..00000000 |
232 |
--- a/sci-libs/hdf5/files/hdf5-1.8.13-implicits.patch |
233 |
+++ /dev/null |
234 |
@@ -1,35 +0,0 @@ |
235 |
---- a/test/cache_common.h |
236 |
-+++ b/test/cache_common.h |
237 |
-@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id, |
238 |
- hbool_t compare_init, |
239 |
- int test_num); |
240 |
- |
241 |
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, |
242 |
-+ const H5C_auto_size_ctl_t *b, |
243 |
-+ hbool_t compare_init); |
244 |
- #endif /* _CACHE_COMMON_H */ |
245 |
- |
246 |
---- a/testpar/t_span_tree.c |
247 |
-+++ b/testpar/t_span_tree.c |
248 |
-@@ -37,6 +37,9 @@ |
249 |
- #include "hdf5.h" |
250 |
- #include "H5private.h" |
251 |
- #include "testphdf5.h" |
252 |
-+#define H5S_PACKAGE |
253 |
-+#define H5S_TESTING |
254 |
-+#include "H5Spkg.h" |
255 |
- |
256 |
- |
257 |
- static void coll_write_test(int chunk_factor); |
258 |
---- a/configure.ac |
259 |
-+++ b/configure.ac |
260 |
-@@ -1504,6 +1504,9 @@ case "$host_cpu-$host_vendor-$host_os" in |
261 |
- ## however, we do not do this since it breaks the big test on some |
262 |
- ## older platforms. |
263 |
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" |
264 |
-+ |
265 |
-+ ## _GNU_SOURCE is needed for vasprintf |
266 |
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" |
267 |
- ;; |
268 |
- esac |
269 |
- |
270 |
|
271 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch |
272 |
deleted file mode 100644 |
273 |
index 4ee6e83..00000000 |
274 |
--- a/sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch |
275 |
+++ /dev/null |
276 |
@@ -1,55 +0,0 @@ |
277 |
---- a/configure.ac |
278 |
-+++ b/configure.ac |
279 |
-@@ -1522,6 +1522,9 @@ case "$host_cpu-$host_vendor-$host_os" in |
280 |
- ## however, we do not do this since it breaks the big test on some |
281 |
- ## older platforms. |
282 |
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" |
283 |
-+ |
284 |
-+ ## _GNU_SOURCE is needed for vasprintf |
285 |
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" |
286 |
- ;; |
287 |
- esac |
288 |
- |
289 |
---- a/hl/src/H5LTanalyze.c |
290 |
-+++ b/hl/src/H5LTanalyze.c |
291 |
-@@ -40,6 +40,7 @@ |
292 |
- #include <string.h> |
293 |
- #include <errno.h> |
294 |
- #include <stdlib.h> |
295 |
-+#include <unistd.h> |
296 |
- |
297 |
- /* end standard C headers. */ |
298 |
- |
299 |
---- a/hl/src/H5LTanalyze.l |
300 |
-+++ b/hl/src/H5LTanalyze.l |
301 |
-@@ -16,6 +16,7 @@ |
302 |
- %{ |
303 |
- #include <stdlib.h> |
304 |
- #include <string.h> |
305 |
-+#include <unistd.h> |
306 |
- #include <hdf5.h> |
307 |
- #include "H5LTparse.h" |
308 |
- |
309 |
---- a/test/cache_common.h |
310 |
-+++ b/test/cache_common.h |
311 |
-@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id, |
312 |
- hbool_t compare_init, |
313 |
- int test_num); |
314 |
- |
315 |
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, |
316 |
-+ const H5C_auto_size_ctl_t *b, |
317 |
-+ hbool_t compare_init); |
318 |
- #endif /* _CACHE_COMMON_H */ |
319 |
- |
320 |
---- a/testpar/t_span_tree.c |
321 |
-+++ b/testpar/t_span_tree.c |
322 |
-@@ -37,6 +37,9 @@ |
323 |
- #include "hdf5.h" |
324 |
- #include "H5private.h" |
325 |
- #include "testphdf5.h" |
326 |
-+#define H5S_PACKAGE |
327 |
-+#define H5S_TESTING |
328 |
-+#include "H5Spkg.h" |
329 |
- |
330 |
- |
331 |
- static void coll_write_test(int chunk_factor); |
332 |
|
333 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.14-ldflags.patch b/sci-libs/hdf5/files/hdf5-1.8.14-ldflags.patch |
334 |
deleted file mode 100644 |
335 |
index c27800d..00000000 |
336 |
--- a/sci-libs/hdf5/files/hdf5-1.8.14-ldflags.patch |
337 |
+++ /dev/null |
338 |
@@ -1,20 +0,0 @@ |
339 |
-Revert changes made to fix HDFFV-8944 |
340 |
- |
341 |
-https://bugs.gentoo.org/show_bug.cgi?id=530746 |
342 |
- |
343 |
---- a/configure.ac |
344 |
-+++ b/configure.ac |
345 |
-@@ -115,12 +115,7 @@ |
346 |
- AM_CXXFLAGS="${AM_CXXFLAGS}" |
347 |
- AM_FCFLAGS="${AM_FCFLAGS}" |
348 |
- AM_CPPFLAGS="${AM_CPPFLAGS}" |
349 |
--# Added to address HDFFV-8944 |
350 |
--if test "x$prefix" = xNONE; then |
351 |
-- AM_LDFLAGS="$AM_LDFLAGS -L$ac_default_prefix/lib" |
352 |
--else |
353 |
-- AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" |
354 |
--fi |
355 |
-+AM_LDFLAGS="${AM_LDFLAGS}" |
356 |
- CFLAGS="${CFLAGS}" |
357 |
- CXXFLAGS="${CXXFLAGS}" |
358 |
- FCFLAGS="${FCFLAGS}" |
359 |
|
360 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.8-array_bounds.patch b/sci-libs/hdf5/files/hdf5-1.8.8-array_bounds.patch |
361 |
deleted file mode 100644 |
362 |
index 042d012..00000000 |
363 |
--- a/sci-libs/hdf5/files/hdf5-1.8.8-array_bounds.patch |
364 |
+++ /dev/null |
365 |
@@ -1,22 +0,0 @@ |
366 |
---- a/perform/pio_engine.c |
367 |
-+++ b/perform/pio_engine.c |
368 |
-@@ -454,7 +454,7 @@ |
369 |
- subdir = (user ? user : login); |
370 |
- |
371 |
- if (subdir) { |
372 |
-- for (i = 0; i < size && prefix[i]; i++) |
373 |
-+ for (i = 0; i < size-1 && prefix[i]; i++) |
374 |
- fullname[i] = prefix[i]; |
375 |
- |
376 |
- fullname[i++] = '/'; |
377 |
---- a/perform/sio_engine.c |
378 |
-+++ b/perform/sio_engine.c |
379 |
-@@ -353,7 +353,7 @@ |
380 |
- subdir = (user ? user : login); |
381 |
- |
382 |
- if (subdir) { |
383 |
-- for (i = 0; i < size && prefix[i]; i++) |
384 |
-+ for (i = 0; i < size-1 && prefix[i]; i++) |
385 |
- fullname[i] = prefix[i]; |
386 |
- |
387 |
- fullname[i++] = '/'; |
388 |
|
389 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch b/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch |
390 |
deleted file mode 100644 |
391 |
index 0f85cf5..00000000 |
392 |
--- a/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch |
393 |
+++ /dev/null |
394 |
@@ -1,33 +0,0 @@ |
395 |
-Prevent build system with messing up LD_LIBRARY_PATH |
396 |
- |
397 |
---- a/configure.in |
398 |
-+++ b/configure.in |
399 |
-@@ -2328,8 +2328,6 @@ |
400 |
- dnl |
401 |
- AC_MSG_CHECKING([how to print long long]) |
402 |
- AC_CACHE_VAL([hdf5_cv_printf_ll], |
403 |
--LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" |
404 |
--export LD_LIBRARY_PATH |
405 |
- |
406 |
- for hdf5_cv_printf_ll in l ll L q unknown; do |
407 |
- AC_TRY_RUN([ |
408 |
---- a/src/Makefile.am |
409 |
-+++ b/src/Makefile.am |
410 |
-@@ -125,8 +125,6 @@ |
411 |
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore |
412 |
- # is set to ignore the error. |
413 |
- H5Tinit.c: H5detect$(EXEEXT) |
414 |
-- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ |
415 |
-- sed -e 's/-L/:/g' -e 's/ //g'`" \ |
416 |
- $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ |
417 |
- (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ |
418 |
- ($(RM) $@ ; exit 1) |
419 |
-@@ -137,8 +135,6 @@ |
420 |
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore |
421 |
- # is set to ignore the error. |
422 |
- H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings |
423 |
-- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ |
424 |
-- sed -e 's/-L/:/g' -e 's/ //g'`" \ |
425 |
- $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \ |
426 |
- (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ |
427 |
- ($(RM) $@ ; exit 1) |
428 |
|
429 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.8-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.8-implicits.patch |
430 |
deleted file mode 100644 |
431 |
index d1217e8..00000000 |
432 |
--- a/sci-libs/hdf5/files/hdf5-1.8.8-implicits.patch |
433 |
+++ /dev/null |
434 |
@@ -1,85 +0,0 @@ |
435 |
---- b/configure.in |
436 |
-+++ a/configure.in |
437 |
-@@ -1499,6 +1499,9 @@ |
438 |
- dnl though we do not do this as it breaks the big test on older versions |
439 |
- dnl of linux (CentOS 4.6) using newer versions of gcc (4.6.2). |
440 |
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" |
441 |
-+ |
442 |
-+ dnl _GNU_SOURCE is needed for vasprintf |
443 |
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" |
444 |
- ;; |
445 |
- esac |
446 |
- |
447 |
---- a/test/cache_common.h |
448 |
-+++ b/test/cache_common.h |
449 |
-@@ -702,5 +702,9 @@ |
450 |
- hbool_t compare_init, |
451 |
- int test_num); |
452 |
- |
453 |
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, |
454 |
-+ const H5C_auto_size_ctl_t *b, |
455 |
-+ hbool_t compare_init); |
456 |
-+ |
457 |
- #endif /* _CACHE_COMMON_H */ |
458 |
- |
459 |
---- a/tools/misc/talign.c |
460 |
-+++ b/tools/misc/talign.c |
461 |
-@@ -23,6 +23,7 @@ |
462 |
- |
463 |
- #include "hdf5.h" |
464 |
- #include "H5private.h" |
465 |
-+#include "h5tools.h" |
466 |
- |
467 |
- const char *fname = "talign.h5"; |
468 |
- const char *setname = "align"; |
469 |
---- a/tools/h5repack/testh5repack_detect_szip.c |
470 |
-+++ b/tools/h5repack/testh5repack_detect_szip.c |
471 |
-@@ -17,6 +17,7 @@ |
472 |
- #include "h5repack.h" |
473 |
- #include "h5tools.h" |
474 |
- #include "h5test.h" |
475 |
-+#include "h5tools_utils.h" |
476 |
- |
477 |
- |
478 |
- /* Name of tool */ |
479 |
---- a/tools/h5jam/h5jam.c |
480 |
-+++ b/tools/h5jam/h5jam.c |
481 |
-@@ -15,6 +15,7 @@ |
482 |
- |
483 |
- #include "hdf5.h" |
484 |
- #include "H5private.h" |
485 |
-+#include "h5tools.h" |
486 |
- #include "h5tools_utils.h" |
487 |
- |
488 |
- /* Name of tool */ |
489 |
---- a/tools/h5jam/h5unjam.c |
490 |
-+++ b/tools/h5jam/h5unjam.c |
491 |
-@@ -15,6 +15,7 @@ |
492 |
- |
493 |
- #include "hdf5.h" |
494 |
- #include "H5private.h" |
495 |
-+#include "h5tools.h" |
496 |
- #include "h5tools_utils.h" |
497 |
- |
498 |
- /* Name of tool */ |
499 |
---- a/tools/h5copy/h5copygentest.c |
500 |
-+++ b/tools/h5copy/h5copygentest.c |
501 |
-@@ -20,6 +20,7 @@ |
502 |
- #include "hdf5.h" |
503 |
- #include "H5private.h" |
504 |
- #include "h5tools.h" |
505 |
-+#include "h5tools_utils.h" |
506 |
- |
507 |
- /* Name of tool */ |
508 |
- #define PROGRAMNAME "h5copygentest" |
509 |
---- a/hl/src/H5LTanalyze.c |
510 |
-+++ b/hl/src/H5LTanalyze.c |
511 |
-@@ -49,7 +49,8 @@ |
512 |
- #define YY_FLEX_MINOR_VERSION 5 |
513 |
- |
514 |
- #include <stdio.h> |
515 |
-+#include "H5pubconf.h" |
516 |
- #ifdef H5_HAVE_UNISTD_H |
517 |
- #include <unistd.h> |
518 |
- #endif |
519 |
- |
520 |
|
521 |
diff --git a/sci-libs/hdf5/files/hdf5-1.8.9-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.9-implicits.patch |
522 |
deleted file mode 100644 |
523 |
index 43e4f07..00000000 |
524 |
--- a/sci-libs/hdf5/files/hdf5-1.8.9-implicits.patch |
525 |
+++ /dev/null |
526 |
@@ -1,55 +0,0 @@ |
527 |
---- b/configure.in |
528 |
-+++ a/configure.in |
529 |
-@@ -1499,6 +1499,9 @@ |
530 |
- dnl though we do not do this as it breaks the big test on older versions |
531 |
- dnl of linux (CentOS 4.6) using newer versions of gcc (4.6.2). |
532 |
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" |
533 |
-+ |
534 |
-+ dnl _GNU_SOURCE is needed for vasprintf |
535 |
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" |
536 |
- ;; |
537 |
- esac |
538 |
- |
539 |
---- a/test/cache_common.h |
540 |
-+++ b/test/cache_common.h |
541 |
-@@ -702,5 +702,9 @@ |
542 |
- hbool_t compare_init, |
543 |
- int test_num); |
544 |
- |
545 |
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a, |
546 |
-+ const H5C_auto_size_ctl_t *b, |
547 |
-+ hbool_t compare_init); |
548 |
-+ |
549 |
- #endif /* _CACHE_COMMON_H */ |
550 |
- |
551 |
---- a/tools/misc/talign.c |
552 |
-+++ b/tools/misc/talign.c |
553 |
-@@ -23,6 +23,7 @@ |
554 |
- |
555 |
- #include "hdf5.h" |
556 |
- #include "H5private.h" |
557 |
-+#include "h5tools.h" |
558 |
- |
559 |
- const char *fname = "talign.h5"; |
560 |
- const char *setname = "align"; |
561 |
---- a/tools/h5repack/testh5repack_detect_szip.c |
562 |
-+++ b/tools/h5repack/testh5repack_detect_szip.c |
563 |
-@@ -17,6 +17,7 @@ |
564 |
- #include "h5repack.h" |
565 |
- #include "h5tools.h" |
566 |
- #include "h5test.h" |
567 |
-+#include "h5tools_utils.h" |
568 |
- |
569 |
- |
570 |
- /* Name of tool */ |
571 |
---- a/hl/src/H5LTanalyze.c |
572 |
-+++ b/hl/src/H5LTanalyze.c |
573 |
-@@ -49,7 +49,8 @@ |
574 |
- #define YY_FLEX_MINOR_VERSION 5 |
575 |
- |
576 |
- #include <stdio.h> |
577 |
-+#include "H5pubconf.h" |
578 |
- #ifdef H5_HAVE_UNISTD_H |
579 |
- #include <unistd.h> |
580 |
- #endif |
581 |
- |
582 |
|
583 |
diff --git a/sci-libs/hdf5/files/mpd.conf b/sci-libs/hdf5/files/mpd.conf |
584 |
deleted file mode 100644 |
585 |
index 07dd982..00000000 |
586 |
--- a/sci-libs/hdf5/files/mpd.conf |
587 |
+++ /dev/null |
588 |
@@ -1,2 +0,0 @@ |
589 |
-secretword=test69hike |
590 |
-MPD_SECRETWORD=test69hike |
591 |
|
592 |
diff --git a/sci-libs/hdf5/hdf5-1.8.14-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.14-r1.ebuild |
593 |
deleted file mode 100644 |
594 |
index cad6c42..00000000 |
595 |
--- a/sci-libs/hdf5/hdf5-1.8.14-r1.ebuild |
596 |
+++ /dev/null |
597 |
@@ -1,105 +0,0 @@ |
598 |
-# Copyright 1999-2015 Gentoo Foundation |
599 |
-# Distributed under the terms of the GNU General Public License v2 |
600 |
-# $Id$ |
601 |
- |
602 |
-EAPI=5 |
603 |
- |
604 |
-FORTRAN_NEEDED=fortran |
605 |
-AUTOTOOLS_AUTORECONF=1 |
606 |
- |
607 |
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib |
608 |
- |
609 |
-MY_P=${PN}-${PV/_p/-patch} |
610 |
- |
611 |
-DESCRIPTION="General purpose library and file format for storing scientific data" |
612 |
-HOMEPAGE="http://www.hdfgroup.org/HDF5/" |
613 |
-SRC_URI="https://support.hdfgroup.org/ftp/HDF5/releases/${MY_P}/src/${MY_P}.tar.bz2" |
614 |
- |
615 |
-LICENSE="NCSA-HDF" |
616 |
-SLOT="0/${PV%%_p*}" |
617 |
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
618 |
-IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib" |
619 |
- |
620 |
-REQUIRED_USE=" |
621 |
- cxx? ( !mpi ) mpi? ( !cxx ) |
622 |
- threads? ( !cxx !mpi !fortran ) |
623 |
- fortran2003? ( fortran )" |
624 |
- |
625 |
-RDEPEND=" |
626 |
- mpi? ( virtual/mpi[romio] ) |
627 |
- szip? ( virtual/szip ) |
628 |
- zlib? ( sys-libs/zlib:0= )" |
629 |
- |
630 |
-DEPEND="${RDEPEND} |
631 |
- sys-devel/libtool:2 |
632 |
- >=sys-devel/autoconf-2.69" |
633 |
- |
634 |
-S="${WORKDIR}/${MY_P}" |
635 |
- |
636 |
-PATCHES=( |
637 |
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch |
638 |
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch |
639 |
- "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch |
640 |
- "${FILESDIR}"/${PN}-1.8.14-implicits.patch |
641 |
- "${FILESDIR}"/${PN}-1.8.14-ldflags.patch |
642 |
-) |
643 |
- |
644 |
-pkg_setup() { |
645 |
- tc-export CXX CC AR # workaround for bug 285148 |
646 |
- if use fortran; then |
647 |
- use fortran2003 && FORTRAN_STANDARD=2003 |
648 |
- fortran-2_pkg_setup |
649 |
- fi |
650 |
- if use mpi; then |
651 |
- if has_version 'sci-libs/hdf5[-mpi]'; then |
652 |
- ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." |
653 |
- ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." |
654 |
- fi |
655 |
- export CC=mpicc |
656 |
- use fortran && export FC=mpif90 |
657 |
- elif has_version 'sci-libs/hdf5[mpi]'; then |
658 |
- ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." |
659 |
- ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." |
660 |
- fi |
661 |
-} |
662 |
- |
663 |
-src_prepare() { |
664 |
- # respect gentoo examples directory |
665 |
- sed \ |
666 |
- -e "s:hdf5_examples:doc/${PF}/examples:g" \ |
667 |
- -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die |
668 |
- sed \ |
669 |
- -e '/docdir/d' \ |
670 |
- -i config/commence.am || die |
671 |
- if ! use examples; then |
672 |
- sed -e '/^install:/ s/install-examples//' \ |
673 |
- -i Makefile.am || die #409091 |
674 |
- fi |
675 |
- # enable shared libs by default for h5cc config utility |
676 |
- sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die |
677 |
- # bug #419677 |
678 |
- use prefix && \ |
679 |
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \ |
680 |
- -Wl,-rpath,"${EPREFIX}"/$(get_libdir) |
681 |
- autotools-utils_src_prepare |
682 |
-} |
683 |
- |
684 |
-src_configure() { |
685 |
- local myeconfargs=( |
686 |
- --enable-production |
687 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
688 |
- --enable-deprecated-symbols |
689 |
- $(use_enable prefix sharedlib-rpath) |
690 |
- $(use_enable debug debug all) |
691 |
- $(use_enable debug codestack) |
692 |
- $(use_enable cxx) |
693 |
- $(use_enable fortran) |
694 |
- $(use_enable fortran2003) |
695 |
- $(use_enable mpi parallel) |
696 |
- $(use_enable threads threadsafe) |
697 |
- $(use_with szip szlib) |
698 |
- $(use_with threads pthread) |
699 |
- $(use_with zlib) |
700 |
- ) |
701 |
- autotools-utils_src_configure |
702 |
-} |
703 |
|
704 |
diff --git a/sci-libs/hdf5/hdf5-1.8.15_p1.ebuild b/sci-libs/hdf5/hdf5-1.8.15_p1.ebuild |
705 |
deleted file mode 100644 |
706 |
index 7ce15e7..00000000 |
707 |
--- a/sci-libs/hdf5/hdf5-1.8.15_p1.ebuild |
708 |
+++ /dev/null |
709 |
@@ -1,104 +0,0 @@ |
710 |
-# Copyright 1999-2015 Gentoo Foundation |
711 |
-# Distributed under the terms of the GNU General Public License v2 |
712 |
-# $Id$ |
713 |
- |
714 |
-EAPI=5 |
715 |
- |
716 |
-FORTRAN_NEEDED=fortran |
717 |
-AUTOTOOLS_AUTORECONF=1 |
718 |
- |
719 |
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib |
720 |
- |
721 |
-MY_P=${PN}-${PV/_p/-patch} |
722 |
- |
723 |
-DESCRIPTION="General purpose library and file format for storing scientific data" |
724 |
-HOMEPAGE="http://www.hdfgroup.org/HDF5/" |
725 |
-SRC_URI="https://support.hdfgroup.org/ftp/HDF5/releases/${MY_P}/src/${MY_P}.tar.bz2" |
726 |
- |
727 |
-LICENSE="NCSA-HDF" |
728 |
-SLOT="0/${PV%%_p*}" |
729 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
730 |
-IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib" |
731 |
- |
732 |
-REQUIRED_USE=" |
733 |
- cxx? ( !mpi ) mpi? ( !cxx ) |
734 |
- threads? ( !cxx !mpi !fortran ) |
735 |
- fortran2003? ( fortran )" |
736 |
- |
737 |
-RDEPEND=" |
738 |
- mpi? ( virtual/mpi[romio] ) |
739 |
- szip? ( virtual/szip ) |
740 |
- zlib? ( sys-libs/zlib:0= )" |
741 |
- |
742 |
-DEPEND="${RDEPEND} |
743 |
- sys-devel/libtool:2 |
744 |
- >=sys-devel/autoconf-2.69" |
745 |
- |
746 |
-S="${WORKDIR}/${MY_P}" |
747 |
- |
748 |
-PATCHES=( |
749 |
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch |
750 |
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch |
751 |
- "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch |
752 |
- "${FILESDIR}"/${PN}-1.8.15-implicits.patch |
753 |
-) |
754 |
- |
755 |
-pkg_setup() { |
756 |
- tc-export CXX CC AR # workaround for bug 285148 |
757 |
- if use fortran; then |
758 |
- use fortran2003 && FORTRAN_STANDARD=2003 |
759 |
- fortran-2_pkg_setup |
760 |
- fi |
761 |
- if use mpi; then |
762 |
- if has_version 'sci-libs/hdf5[-mpi]'; then |
763 |
- ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." |
764 |
- ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." |
765 |
- fi |
766 |
- export CC=mpicc |
767 |
- use fortran && export FC=mpif90 |
768 |
- elif has_version 'sci-libs/hdf5[mpi]'; then |
769 |
- ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." |
770 |
- ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." |
771 |
- fi |
772 |
-} |
773 |
- |
774 |
-src_prepare() { |
775 |
- # respect gentoo examples directory |
776 |
- sed \ |
777 |
- -e "s:hdf5_examples:doc/${PF}/examples:g" \ |
778 |
- -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die |
779 |
- sed \ |
780 |
- -e '/docdir/d' \ |
781 |
- -i config/commence.am || die |
782 |
- if ! use examples; then |
783 |
- sed -e '/^install:/ s/install-examples//' \ |
784 |
- -i Makefile.am || die #409091 |
785 |
- fi |
786 |
- # enable shared libs by default for h5cc config utility |
787 |
- sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die |
788 |
- # bug #419677 |
789 |
- use prefix && \ |
790 |
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \ |
791 |
- -Wl,-rpath,"${EPREFIX}"/$(get_libdir) |
792 |
- autotools-utils_src_prepare |
793 |
-} |
794 |
- |
795 |
-src_configure() { |
796 |
- local myeconfargs=( |
797 |
- --enable-production |
798 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
799 |
- --enable-deprecated-symbols |
800 |
- $(use_enable prefix sharedlib-rpath) |
801 |
- $(use_enable debug debug all) |
802 |
- $(use_enable debug codestack) |
803 |
- $(use_enable cxx) |
804 |
- $(use_enable fortran) |
805 |
- $(use_enable fortran2003) |
806 |
- $(use_enable mpi parallel) |
807 |
- $(use_enable threads threadsafe) |
808 |
- $(use_with szip szlib) |
809 |
- $(use_with threads pthread) |
810 |
- $(use_with zlib) |
811 |
- ) |
812 |
- autotools-utils_src_configure |
813 |
-} |
814 |
|
815 |
diff --git a/sci-libs/hdf5/hdf5-1.8.17.ebuild b/sci-libs/hdf5/hdf5-1.8.17.ebuild |
816 |
deleted file mode 100644 |
817 |
index 7b186c5..00000000 |
818 |
--- a/sci-libs/hdf5/hdf5-1.8.17.ebuild |
819 |
+++ /dev/null |
820 |
@@ -1,110 +0,0 @@ |
821 |
-# Copyright 1999-2016 Gentoo Foundation |
822 |
-# Distributed under the terms of the GNU General Public License v2 |
823 |
-# $Id$ |
824 |
- |
825 |
-EAPI=5 |
826 |
- |
827 |
-FORTRAN_NEEDED=fortran |
828 |
-AUTOTOOLS_AUTORECONF=1 |
829 |
- |
830 |
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib |
831 |
- |
832 |
-MY_P=${PN}-${PV/_p/-patch} |
833 |
- |
834 |
-DESCRIPTION="General purpose library and file format for storing scientific data" |
835 |
-HOMEPAGE="http://www.hdfgroup.org/HDF5/" |
836 |
-SRC_URI="https://support.hdfgroup.org/ftp/HDF5/releases/${MY_P}/src/${MY_P}.tar.bz2" |
837 |
- |
838 |
-LICENSE="NCSA-HDF" |
839 |
-SLOT="0/${PV%%_p*}" |
840 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
841 |
-IUSE="cxx debug examples fortran fortran2003 +hl mpi static-libs szip threads zlib" |
842 |
- |
843 |
-REQUIRED_USE=" |
844 |
- threads? ( !cxx !mpi !fortran !hl ) |
845 |
- fortran2003? ( fortran )" |
846 |
- |
847 |
-RDEPEND=" |
848 |
- mpi? ( virtual/mpi[romio] ) |
849 |
- szip? ( virtual/szip ) |
850 |
- zlib? ( sys-libs/zlib:0= )" |
851 |
- |
852 |
-DEPEND="${RDEPEND} |
853 |
- sys-devel/libtool:2 |
854 |
- >=sys-devel/autoconf-2.69" |
855 |
- |
856 |
-S="${WORKDIR}/${MY_P}" |
857 |
- |
858 |
-PATCHES=( |
859 |
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch |
860 |
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch |
861 |
- "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch |
862 |
- "${FILESDIR}"/${PN}-1.8.15-implicits.patch |
863 |
-) |
864 |
- |
865 |
-pkg_setup() { |
866 |
- tc-export CXX CC AR # workaround for bug 285148 |
867 |
- if use fortran; then |
868 |
- use fortran2003 && FORTRAN_STANDARD=2003 |
869 |
- fortran-2_pkg_setup |
870 |
- fi |
871 |
- if use mpi; then |
872 |
- if has_version 'sci-libs/hdf5[-mpi]'; then |
873 |
- ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." |
874 |
- ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." |
875 |
- fi |
876 |
- export CC=mpicc |
877 |
- use fortran && export FC=mpif90 |
878 |
- if use cxx ; then |
879 |
- export CXX=mpicxx |
880 |
- ewarn "USE='mpi cxx' requires a configuration unsupported by upstream. Use at your own risk." |
881 |
- ewarn "In particular, the C++ API is not parallel safe." |
882 |
- fi |
883 |
- elif has_version 'sci-libs/hdf5[mpi]'; then |
884 |
- ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." |
885 |
- ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." |
886 |
- fi |
887 |
-} |
888 |
- |
889 |
-src_prepare() { |
890 |
- # respect gentoo examples directory |
891 |
- sed \ |
892 |
- -e "s:hdf5_examples:doc/${PF}/examples:g" \ |
893 |
- -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die |
894 |
- sed \ |
895 |
- -e '/docdir/d' \ |
896 |
- -i config/commence.am || die |
897 |
- if ! use examples; then |
898 |
- sed -e '/^install:/ s/install-examples//' \ |
899 |
- -i Makefile.am || die #409091 |
900 |
- fi |
901 |
- # enable shared libs by default for h5cc config utility |
902 |
- sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die |
903 |
- # bug #419677 |
904 |
- use prefix && \ |
905 |
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \ |
906 |
- -Wl,-rpath,"${EPREFIX}"/$(get_libdir) |
907 |
- autotools-utils_src_prepare |
908 |
-} |
909 |
- |
910 |
-src_configure() { |
911 |
- local myeconfargs=( |
912 |
- --enable-production |
913 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
914 |
- --enable-deprecated-symbols |
915 |
- $(use_enable prefix sharedlib-rpath) |
916 |
- $(use_enable debug debug all) |
917 |
- $(use_enable debug codestack) |
918 |
- $(use_enable cxx) |
919 |
- $(use_enable fortran) |
920 |
- $(use_enable fortran2003) |
921 |
- $(use_enable hl) |
922 |
- $(use_enable mpi parallel) |
923 |
- $(use_enable threads threadsafe) |
924 |
- $(use_with szip szlib) |
925 |
- $(use_with threads pthread) |
926 |
- $(use_with zlib) |
927 |
- $(use mpi && use cxx && echo --enable-unsupported) |
928 |
- ) |
929 |
- autotools-utils_src_configure |
930 |
-} |