From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A10613835A for ; Sat, 27 Feb 2021 04:42:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9BAEE08F2; Sat, 27 Feb 2021 04:42:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A18B2E08F2 for ; Sat, 27 Feb 2021 04:42:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5F12341096 for ; Sat, 27 Feb 2021 04:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E26324C6 for ; Sat, 27 Feb 2021 04:42:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1614399619.e8c2408f77fc7284593b0260a62b8998438afb51.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/montage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/montage/montage-5.0.ebuild X-VCS-Directories: sci-astronomy/montage/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e8c2408f77fc7284593b0260a62b8998438afb51 X-VCS-Branch: master Date: Sat, 27 Feb 2021 04:42:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b54929a-6136-490a-90b3-5e7330337d33 X-Archives-Hash: edaba6419394c6c4a71708df0732af25 commit: e8c2408f77fc7284593b0260a62b8998438afb51 Author: Sam James gentoo org> AuthorDate: Sat Feb 27 04:20:19 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 27 04:20:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c2408f sci-astronomy/montage: fix gcc 10 (-fno-common) build Closes: https://bugs.gentoo.org/708396 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sci-astronomy/montage/montage-5.0.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sci-astronomy/montage/montage-5.0.ebuild b/sci-astronomy/montage/montage-5.0.ebuild index d426c00c3c1..850a2ff98dc 100644 --- a/sci-astronomy/montage/montage-5.0.ebuild +++ b/sci-astronomy/montage/montage-5.0.ebuild @@ -1,20 +1,19 @@ -# 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 eutils toolchain-funcs +inherit toolchain-funcs flag-o-matic MYPN=Montage - DESCRIPTION="Toolkit for assembling FITS images into mosaics" HOMEPAGE="http://montage.ipac.caltech.edu/" SRC_URI="http://montage.ipac.caltech.edu/download/${MYPN}_v${PV}.tar.gz" +S="${WORKDIR}/${MYPN}" LICENSE="BSD GPL-2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" - IUSE="doc mpi" RDEPEND=" @@ -31,10 +30,9 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0-fix_freetype_incude.patch ) -S="${WORKDIR}/${MYPN}" - src_prepare() { default + sed -e '/cfitsio/d' \ -e '/wcssubs/d' \ -e '/jpeg/d' \ @@ -43,6 +41,9 @@ src_prepare() { tc-export CC AR + # bug #708396 + append-cflags -fcommon + find . -name Makefile\* | xargs sed -i \ -e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \ -e "/^CFLAGS.*=/s:-g:${CFLAGS} $($(tc-getPKG_CONFIG) --cflags wcstools):g" \