commit: 889e3d4327c8d5e88412da05ad2f9bb73164aec6 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Oct 4 13:21:22 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Oct 4 13:21:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889e3d43
sci-astronomy/missfits: Fix -fno-common Closes: https://bugs.gentoo.org/707528 Closes: https://bugs.gentoo.org/725298 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../missfits/files/missfits-2.8.0-fno-common.patch | 65 ++++++++++++++++++++++ .../files/missfits-2.8.0-run-AM_PROG_AR.patch | 10 ++++ sci-astronomy/missfits/missfits-2.8.0.ebuild | 20 +++++-- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch new file mode 100644 index 00000000000..0c7e042376b --- /dev/null +++ b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch @@ -0,0 +1,65 @@ +--- a/src/file.c ++++ b/src/file.c +@@ -45,6 +45,8 @@ + #include "prefs.h" + #include "xml.h" + ++char gstr[MAXCHAR]; ++ + /****** load_fitsfiles ******************************************************* + PROTO catstruct **load_fitsfiles(char *name, int *ncat, int * outcat, + filenum *filetype, int *headflag) +--- a/src/fits/fitscat.h ++++ b/src/fits/fitscat.h +@@ -333,6 +333,6 @@ + warning(char *msg1, char *msg2); + + +-int bswapflag; ++extern int bswapflag; + + #endif +--- a/src/fits/fitscheck.c ++++ b/src/fits/fitscheck.c +@@ -38,6 +38,8 @@ + #include "fitscat_defs.h" + #include "fitscat.h" + ++int bswapflag; ++ + #define ENCODE_OFFSET 0x30 + unsigned int exclude[13] = {0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, + 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60}; +--- a/src/globals.h ++++ b/src/globals.h +@@ -30,7 +30,7 @@ + #include "types.h" + + /*----------------------- miscellaneous variables ---------------------------*/ +-char gstr[MAXCHAR]; ++extern char gstr[MAXCHAR]; + + /*------------------------------- functions ---------------------------------*/ + extern void makeit(void), +--- a/src/prefs.c ++++ b/src/prefs.c +@@ -50,6 +50,8 @@ + #include "prefs.h" + #include "preflist.h" + ++prefstruct prefs; ++ + /********************************* dumpprefs ********************************/ + /* + Print the default preference parameters. +--- a/src/prefs.h ++++ b/src/prefs.h +@@ -84,7 +84,7 @@ + double time_diff; /* Execution time */ + } prefstruct; + +-prefstruct prefs; ++extern prefstruct prefs; + + /*----------------------------- Internal constants --------------------------*/ + diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch new file mode 100644 index 00000000000..33166519fc6 --- /dev/null +++ b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -78,6 +78,7 @@ + ACX_PROG_CC_OPTIM + fi + ++AM_PROG_AR + AC_PROG_RANLIB + AC_PROG_INSTALL + diff --git a/sci-astronomy/missfits/missfits-2.8.0.ebuild b/sci-astronomy/missfits/missfits-2.8.0.ebuild index 970e40703b1..c619190e23f 100644 --- a/sci-astronomy/missfits/missfits-2.8.0.ebuild +++ b/sci-astronomy/missfits/missfits-2.8.0.ebuild @@ -1,21 +1,29 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit autotools DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files" HOMEPAGE="http://www.astromatic.net/software/missfits/"; SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"; -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="GPL-3" SLOT="0" -IUSE="doc" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -RDEPEND="" -DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-run-AM_PROG_AR.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_prepare() { + default + eautoreconf +} src_install() { default - use doc && dodoc doc/* + dodoc -r doc/. }
