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-astronomy/stiff/
Date: Sat, 27 Feb 2021 05:16:29
Message-Id: 1614401564.56ab65de7dfe1d8de3aa2e932426386fe9f3e947.sam@gentoo
1 commit: 56ab65de7dfe1d8de3aa2e932426386fe9f3e947
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 04:52:44 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 04:52:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ab65de
7
8 sci-astronomy/stiff: fix gcc 10 build
9
10 Closes: https://bugs.gentoo.org/708382
11 Package-Manager: Portage-3.0.15, Repoman-3.0.2
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sci-astronomy/stiff/stiff-2.4.0.ebuild | 14 +++++++++++---
15 1 file changed, 11 insertions(+), 3 deletions(-)
16
17 diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
18 index 5d5e1701b58..85bdc78a39f 100644
19 --- a/sci-astronomy/stiff/stiff-2.4.0.ebuild
20 +++ b/sci-astronomy/stiff/stiff-2.4.0.ebuild
21 @@ -1,13 +1,13 @@
22 # Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 +EAPI=7
27
28 if [[ ${PV} == "9999" ]] ; then
29 inherit subversion
30 ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
31 - SRC_URI=""
32 else
33 + inherit flag-o-matic
34 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
35 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
36 fi
37 @@ -25,8 +25,16 @@ RDEPEND="
38 sys-libs/zlib:0="
39 DEPEND="${RDEPEND}"
40
41 +src_prepare() {
42 + default
43 +
44 + # bug #708382
45 + append-cflags -fcommon
46 +}
47 +
48 src_configure() {
49 - ECONF_SOURCE="${S}" econf $(use_enable threads)
50 + CONFIG_SHELL="${EPREFIX}/bin/bash" ECONF_SOURCE="${S}" econf \
51 + $(use_enable threads)
52 }
53
54 src_install() {