commit: 29021980e0fdcb21cc7cfad2b243e90e98851965 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 4 01:18:16 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 4 01:18:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29021980
sci-astronomy/psfex: add gcc 10 workaround Closes: https://bugs.gentoo.org/724588 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-astronomy/psfex/psfex-3.17.1.ebuild | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sci-astronomy/psfex/psfex-3.17.1.ebuild b/sci-astronomy/psfex/psfex-3.17.1.ebuild index a6635393b98..d5dbf1306d4 100644 --- a/sci-astronomy/psfex/psfex-3.17.1.ebuild +++ b/sci-astronomy/psfex/psfex-3.17.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Extracts models of the Point Spread Function from FITS images" HOMEPAGE="http://www.astromatic.net/software/psfex"; @@ -14,12 +14,12 @@ LICENSE="GPL-3" SLOT="0" IUSE="doc threads plplot" +BDEPEND="virtual/pkgconfig" RDEPEND=" sci-libs/atlas:0[lapack,threads=] sci-libs/fftw:3.0 plplot? ( sci-libs/plplot:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${P}-have-mmap.patch" @@ -29,13 +29,16 @@ PATCHES=( src_prepare() { default - local mycblas=atlcblas myclapack=atlclapack + + local mycblas=atlcblas myclapack=atlclapack + if use threads; then - [[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \ + [[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \ mycblas=ptcblas - [[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] && + [[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && myclapack=ptclapack fi + # fix the configure and not the acx_atlas.m4. the eautoreconf will # produce a configure giving a wrong install Makefile target (to fix) sed -e "s/-lcblas/-l${mycblas}/g" \ @@ -51,6 +54,9 @@ src_prepare() { } src_configure() { + # bug #724588 + append-cflags "-fcommon" + econf \ --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \ $(use_enable plplot) \
