commit: 4129eb414e8ac4027b2e7c4b9445aa8075fd8dea Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 13:49:32 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 13:49:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4129eb41
sci-biology/mcl: Fix building against GCC 10 Closes: https://bugs.gentoo.org/706530 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...ons.patch => mcl-14.137-fix-declarations.patch} | 34 +++++++++++++++++++--- sci-biology/mcl/mcl-14.137.ebuild | 2 +- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch b/sci-biology/mcl/files/mcl-14.137-fix-declarations.patch similarity index 51% rename from sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch rename to sci-biology/mcl/files/mcl-14.137-fix-declarations.patch index df4309874d4..4974d352bf7 100644 --- a/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch +++ b/sci-biology/mcl/files/mcl-14.137-fix-declarations.patch @@ -5,8 +5,34 @@ Fix QA issues related to implicit declarations. * clmadjust.c:184:10: warning: implicit declaration of function ‘mcxFree’ [-Wimplicit-function-declaration] * mcxi.c:42:16: warning: implicit declaration of function ‘isatty’ [-Wimplicit-function-declaration] ---- mcl-14-137/src/shcl/clmadjust.c -+++ mcl-14-137/src/shcl/clmadjust.c +--- a/src/impala/iface.h ++++ b/src/impala/iface.h +@@ -16,15 +16,15 @@ + + /* This file currently provides nothing */ + +-dim nu_meet_can ; +-dim nu_meet_sl ; +-dim nu_meet_zip ; +-dim nu_diff_can ; +-dim nu_diff_sl ; +-dim nu_diff_zip ; +-double nu_magic ; ++extern dim nu_meet_can ; ++extern dim nu_meet_sl ; ++extern dim nu_meet_zip ; ++extern dim nu_diff_can ; ++extern dim nu_diff_sl ; ++extern dim nu_diff_zip ; ++extern double nu_magic ; + +-dim mclx_n_thread_g ; ++extern dim mclx_n_thread_g ; + + #endif + +--- a/src/shcl/clmadjust.c ++++ b/src/shcl/clmadjust.c @@ -14,6 +14,7 @@ #include "report.h" #include "clmadjust.h" @@ -15,8 +41,8 @@ Fix QA issues related to implicit declarations. #include "util/io.h" #include "util/types.h" #include "util/err.h" ---- mcl-14-137/src/shmcx/mcxi.c -+++ mcl-14-137/src/shmcx/mcxi.c +--- a/src/shmcx/mcxi.c ++++ b/src/shmcx/mcxi.c @@ -8,6 +8,7 @@ */ diff --git a/sci-biology/mcl/mcl-14.137.ebuild b/sci-biology/mcl/mcl-14.137.ebuild index 40c96e8a4b1..e7924bccec3 100644 --- a/sci-biology/mcl/mcl-14.137.ebuild +++ b/sci-biology/mcl/mcl-14.137.ebuild @@ -19,7 +19,7 @@ IUSE="+blast" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${P}-qa-implicit-declarations.patch + "${FILESDIR}"/${P}-fix-declarations.patch "${FILESDIR}"/${P}-fix-autotools.patch )
