[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/

["Sam James" <sam@gentoo.org>]

commit:     4a3fe05ed8aba8c04914b8dedd831ab1856a6e7f
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue May  3 01:33:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 02:05:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3fe05e

sci-libs/hdf5: Stabilize 1.10.5-r1 sparc, #733578

Closes: https://bugs.gentoo.org/686620
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/25291
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/hdf5/hdf5-1.10.5-r1.ebuild | 7 ++++---
 sci-libs/hdf5/hdf5-1.10.5.ebuild    | 5 +++--
 sci-libs/hdf5/hdf5-1.12.1-r1.ebuild | 3 ++-
 sci-libs/hdf5/hdf5-1.12.1.ebuild    | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index b7aac2788497..aa45759413ec 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 FORTRAN_NEEDED="fortran"
 
-inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
@@ -83,6 +83,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local myconf=(
 		--disable-static
 		--enable-deprecated-symbols

diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index f33f957fdad7..1b6770c23e14 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
 
 MY_P=${PN}-${PV/_p/-patch}
 MAJOR_P=${PN}-$(ver_cut 1-2)
@@ -78,6 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	econf \
 		--disable-static \
 		--enable-deprecated-symbols \

diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
index 890baf3cee25..32a8891c8155 100644
--- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 FORTRAN_NEEDED="fortran"
 
-inherit cmake flag-o-matic fortran-2
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -66,6 +66,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local mycmakeargs=(
 		# Workaround needed to allow build with USE=fortran when an older
 		# version is installed. See bug #808633 and

diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild
index c5ef043111b3..8248d6614f5a 100644
--- a/sci-libs/hdf5/hdf5-1.12.1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED="fortran"
 
-inherit cmake flag-o-matic fortran-2
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -62,6 +62,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=OFF
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON