Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/
Date: Tue, 03 May 2022 02:28:05
Message-Id: 1651543552.4a3fe05ed8aba8c04914b8dedd831ab1856a6e7f.sam@gentoo
1 commit: 4a3fe05ed8aba8c04914b8dedd831ab1856a6e7f
2 Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Tue May 3 01:33:00 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 02:05:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3fe05e
7
8 sci-libs/hdf5: Stabilize 1.10.5-r1 sparc, #733578
9
10 Closes: https://bugs.gentoo.org/686620
11 Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
12 Closes: https://github.com/gentoo/gentoo/pull/25291
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sci-libs/hdf5/hdf5-1.10.5-r1.ebuild | 7 ++++---
16 sci-libs/hdf5/hdf5-1.10.5.ebuild | 5 +++--
17 sci-libs/hdf5/hdf5-1.12.1-r1.ebuild | 3 ++-
18 sci-libs/hdf5/hdf5-1.12.1.ebuild | 5 +++--
19 4 files changed, 12 insertions(+), 8 deletions(-)
20
21 diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
22 index b7aac2788497..aa45759413ec 100644
23 --- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
24 +++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
25 @@ -1,11 +1,11 @@
26 -# Copyright 1999-2021 Gentoo Authors
27 +# Copyright 1999-2022 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI="7"
31
32 FORTRAN_NEEDED="fortran"
33
34 -inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
35 +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
36
37 MY_P="${PN}-${PV/_p/-patch}"
38 MAJOR_P="${PN}-$(ver_cut 1-2)"
39 @@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
40
41 LICENSE="NCSA-HDF"
42 SLOT="0/${PV%%_p*}"
43 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
44 +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
45 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
46
47 REQUIRED_USE="
48 @@ -83,6 +83,7 @@ src_prepare() {
49 }
50
51 src_configure() {
52 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
53 local myconf=(
54 --disable-static
55 --enable-deprecated-symbols
56
57 diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
58 index f33f957fdad7..1b6770c23e14 100644
59 --- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
60 +++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
61 @@ -1,11 +1,11 @@
62 -# Copyright 1999-2021 Gentoo Authors
63 +# Copyright 1999-2022 Gentoo Authors
64 # Distributed under the terms of the GNU General Public License v2
65
66 EAPI=7
67
68 FORTRAN_NEEDED=fortran
69
70 -inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
71 +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
72
73 MY_P=${PN}-${PV/_p/-patch}
74 MAJOR_P=${PN}-$(ver_cut 1-2)
75 @@ -78,6 +78,7 @@ src_prepare() {
76 }
77
78 src_configure() {
79 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
80 econf \
81 --disable-static \
82 --enable-deprecated-symbols \
83
84 diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
85 index 890baf3cee25..32a8891c8155 100644
86 --- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
87 +++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
88 @@ -5,7 +5,7 @@ EAPI=7
89
90 FORTRAN_NEEDED="fortran"
91
92 -inherit cmake flag-o-matic fortran-2
93 +inherit cmake flag-o-matic fortran-2 toolchain-funcs
94
95 MY_P="${PN}-${PV/_p/-patch}"
96 MAJOR_P="${PN}-$(ver_cut 1-2)"
97 @@ -66,6 +66,7 @@ pkg_setup() {
98 }
99
100 src_configure() {
101 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
102 local mycmakeargs=(
103 # Workaround needed to allow build with USE=fortran when an older
104 # version is installed. See bug #808633 and
105
106 diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild
107 index c5ef043111b3..8248d6614f5a 100644
108 --- a/sci-libs/hdf5/hdf5-1.12.1.ebuild
109 +++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild
110 @@ -1,11 +1,11 @@
111 -# Copyright 1999-2021 Gentoo Authors
112 +# Copyright 1999-2022 Gentoo Authors
113 # Distributed under the terms of the GNU General Public License v2
114
115 EAPI=7
116
117 FORTRAN_NEEDED="fortran"
118
119 -inherit cmake flag-o-matic fortran-2
120 +inherit cmake flag-o-matic fortran-2 toolchain-funcs
121
122 MY_P="${PN}-${PV/_p/-patch}"
123 MAJOR_P="${PN}-$(ver_cut 1-2)"
124 @@ -62,6 +62,7 @@ pkg_setup() {
125 }
126
127 src_configure() {
128 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
129 local mycmakeargs=(
130 -DBUILD_STATIC_LIBS=OFF
131 -DFETCHCONTENT_FULLY_DISCONNECTED=ON