Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/hdf5/files: hdf5-1.8.10-comments.patch
Date: Sun, 30 Dec 2012 17:02:55
Message-Id: 20121230170244.C6E292171E@flycatcher.gentoo.org
1 xarthisius 12/12/30 17:02:44
2
3 Added: hdf5-1.8.10-comments.patch
4 Log:
5 Fix comments to prevent build failures on ia64 wrt #447740 by Agostino Sarubbo <ago@g.o>
6
7 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
8
9 Revision Changes Path
10 1.1 sci-libs/hdf5/files/hdf5-1.8.10-comments.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch?rev=1.1&content-type=text/plain
14
15 Index: hdf5-1.8.10-comments.patch
16 ===================================================================
17 Convert // comment marks to /**/ in order to fix FTBS on ia64
18
19 https://bugs.gentoo.org/show_bug.cgi?id=447740
20
21 Patch written by Kacper Kowalik <xarthisius@g.o>
22 --- a/test/th5s.c
23 +++ b/test/th5s.c
24 @@ -730,8 +730,8 @@ test_h5s_zero_dim(void)
25 ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
26 CHECK(ret, FAIL, "H5Pset_chunk");
27
28 - // ret = H5Pset_alloc_time(plist_id, alloc_time);
29 - // CHECK(ret, FAIL, "H5Pset_alloc_time");
30 + /* ret = H5Pset_alloc_time(plist_id, alloc_time);
31 + CHECK(ret, FAIL, "H5Pset_alloc_time"); */
32
33 dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
34 CHECK(dset1, FAIL, "H5Dcreate2");
35 --- a/tools/h5dump/h5dump_ddl.c
36 +++ b/tools/h5dump/h5dump_ddl.c
37 @@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe
38 string_dataformat.do_escape = display_escape;
39 outputformat = &string_dataformat;
40
41 - //attr_name = attr + j + 1;
42 - // need to replace escape characters
43 + /* attr_name = attr + j + 1; */
44 + /* need to replace escape characters */
45 attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
46
47
48 --- a/tools/lib/h5tools_str.c
49 +++ b/tools/lib/h5tools_str.c
50 @@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
51 h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
52 }
53
54 -// ctx->need_prefix = 0;
55 + /* ctx->need_prefix = 0; */
56 }
57
58 /*-------------------------------------------------------------------------