From 6f946577f461f5c29bac8f117c13057c40d50782 Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 2 May 2022 21:33:00 -0400 Subject: [PATCH] sci-libs/hdf5: Stabilize 1.10.5-r1 sparc, #733578 Closes: https://bugs.gentoo.org/686620 Signed-off-by: matoro --- 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 b7aac27884976..aa45759413eca 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 f33f957fdad78..1b6770c23e14e 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 890baf3cee258..32a8891c81555 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 c5ef043111b3f..8248d6614f5ad 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