| 1 |
commit: 397297785fbdfde84c7378475b0ac143796d242e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 23:09:50 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 23:09:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39729778 |
| 7 |
|
| 8 |
sci-astronomy/stuff: Fix -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706944 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../stuff/files/stuff-1.26.0-fno-common.patch | 60 ++++++++++++++++++++++ |
| 15 |
sci-astronomy/stuff/stuff-1.26.0.ebuild | 9 ++-- |
| 16 |
2 files changed, 64 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch b/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..bb02fa9e26f |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-astronomy/stuff/files/stuff-1.26.0-fno-common.patch |
| 23 |
@@ -0,0 +1,60 @@ |
| 24 |
+--- a/src/cosmo.c |
| 25 |
++++ b/src/cosmo.c |
| 26 |
+@@ -39,6 +39,11 @@ |
| 27 |
+ #include "cosmo.h" |
| 28 |
+ #include "lf.h" |
| 29 |
+ |
| 30 |
++char gstr[MAXCHAR]; |
| 31 |
++int bswapflag; |
| 32 |
++ |
| 33 |
++double H, H0, OmegaM, OmegaL, deltaMH; |
| 34 |
++ |
| 35 |
+ /******************************** cosmo_dconf ********************************/ |
| 36 |
+ /* |
| 37 |
+ Conformal distance. Numerical integration along geodesic, allowing for a |
| 38 |
+--- a/src/cosmo.h |
| 39 |
++++ b/src/cosmo.h |
| 40 |
+@@ -38,7 +38,7 @@ |
| 41 |
+ |
| 42 |
+ /*------------------------------ global variables ---------------------------*/ |
| 43 |
+ |
| 44 |
+-double H, H0, OmegaM, OmegaL, deltaMH; |
| 45 |
++extern double H, H0, OmegaM, OmegaL, deltaMH; |
| 46 |
+ |
| 47 |
+ /*-------------------------------- protos -----------------------------------*/ |
| 48 |
+ |
| 49 |
+--- a/src/globals.h |
| 50 |
++++ b/src/globals.h |
| 51 |
+@@ -29,8 +29,8 @@ |
| 52 |
+ #include "types.h" |
| 53 |
+ |
| 54 |
+ /*----------------------- miscellaneous variables ---------------------------*/ |
| 55 |
+-char gstr[MAXCHAR]; |
| 56 |
+-int bswapflag; |
| 57 |
++extern char gstr[MAXCHAR]; |
| 58 |
++extern int bswapflag; |
| 59 |
+ |
| 60 |
+ /*------------------------------- functions ---------------------------------*/ |
| 61 |
+ extern void error(int, char *, char *), |
| 62 |
+--- a/src/prefs.c |
| 63 |
++++ b/src/prefs.c |
| 64 |
+@@ -53,6 +53,8 @@ |
| 65 |
+ #include "prefs.h" |
| 66 |
+ #include "preflist.h" |
| 67 |
+ |
| 68 |
++prefstruct prefs; |
| 69 |
++ |
| 70 |
+ /********************************* dumpprefs ********************************/ |
| 71 |
+ /* |
| 72 |
+ Print the default preference parameters. |
| 73 |
+--- a/src/prefs.h |
| 74 |
++++ b/src/prefs.h |
| 75 |
+@@ -136,7 +136,7 @@ |
| 76 |
+ double time_diff; /* Execution time */ |
| 77 |
+ } prefstruct; |
| 78 |
+ |
| 79 |
+-prefstruct prefs; |
| 80 |
++extern prefstruct prefs; |
| 81 |
+ |
| 82 |
+ /*----------------------------- Internal constants --------------------------*/ |
| 83 |
+ |
| 84 |
|
| 85 |
diff --git a/sci-astronomy/stuff/stuff-1.26.0.ebuild b/sci-astronomy/stuff/stuff-1.26.0.ebuild |
| 86 |
index cc672651f26..8c31f838acd 100644 |
| 87 |
--- a/sci-astronomy/stuff/stuff-1.26.0.ebuild |
| 88 |
+++ b/sci-astronomy/stuff/stuff-1.26.0.ebuild |
| 89 |
@@ -1,19 +1,18 @@ |
| 90 |
-# Copyright 1999-2016 Gentoo Foundation |
| 91 |
+# Copyright 1999-2020 Gentoo Authors |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
|
| 94 |
-EAPI=6 |
| 95 |
+EAPI=7 |
| 96 |
|
| 97 |
DESCRIPTION="Tool for automatic generation of astronomical catalogs" |
| 98 |
HOMEPAGE="http://www.astromatic.net/software/stuff/" |
| 99 |
SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
| 100 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 101 |
|
| 102 |
LICENSE="GPL-3" |
| 103 |
SLOT="0" |
| 104 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 105 |
IUSE="threads" |
| 106 |
|
| 107 |
-RDEPEND="" |
| 108 |
-DEPEND="${RDEPEND}" |
| 109 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 110 |
|
| 111 |
src_configure() { |
| 112 |
econf $(use_enable threads) |
Archives