1 |
commit: e8c2408f77fc7284593b0260a62b8998438afb51 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 04:20:19 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 04:20:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c2408f |
7 |
|
8 |
sci-astronomy/montage: fix gcc 10 (-fno-common) build |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708396 |
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/montage/montage-5.0.ebuild | 15 ++++++++------- |
15 |
1 file changed, 8 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/sci-astronomy/montage/montage-5.0.ebuild b/sci-astronomy/montage/montage-5.0.ebuild |
18 |
index d426c00c3c1..850a2ff98dc 100644 |
19 |
--- a/sci-astronomy/montage/montage-5.0.ebuild |
20 |
+++ b/sci-astronomy/montage/montage-5.0.ebuild |
21 |
@@ -1,20 +1,19 @@ |
22 |
-# Copyright 1999-2020 Gentoo Authors |
23 |
+# Copyright 1999-2021 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=6 |
27 |
+EAPI=7 |
28 |
|
29 |
-inherit eutils toolchain-funcs |
30 |
+inherit toolchain-funcs flag-o-matic |
31 |
|
32 |
MYPN=Montage |
33 |
- |
34 |
DESCRIPTION="Toolkit for assembling FITS images into mosaics" |
35 |
HOMEPAGE="http://montage.ipac.caltech.edu/" |
36 |
SRC_URI="http://montage.ipac.caltech.edu/download/${MYPN}_v${PV}.tar.gz" |
37 |
+S="${WORKDIR}/${MYPN}" |
38 |
|
39 |
LICENSE="BSD GPL-2" |
40 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
41 |
SLOT="0" |
42 |
- |
43 |
IUSE="doc mpi" |
44 |
|
45 |
RDEPEND=" |
46 |
@@ -31,10 +30,9 @@ PATCHES=( |
47 |
"${FILESDIR}"/${PN}-5.0-fix_freetype_incude.patch |
48 |
) |
49 |
|
50 |
-S="${WORKDIR}/${MYPN}" |
51 |
- |
52 |
src_prepare() { |
53 |
default |
54 |
+ |
55 |
sed -e '/cfitsio/d' \ |
56 |
-e '/wcssubs/d' \ |
57 |
-e '/jpeg/d' \ |
58 |
@@ -43,6 +41,9 @@ src_prepare() { |
59 |
|
60 |
tc-export CC AR |
61 |
|
62 |
+ # bug #708396 |
63 |
+ append-cflags -fcommon |
64 |
+ |
65 |
find . -name Makefile\* | xargs sed -i \ |
66 |
-e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \ |
67 |
-e "/^CFLAGS.*=/s:-g:${CFLAGS} $($(tc-getPKG_CONFIG) --cflags wcstools):g" \ |