commit: 4550eaf9f23d3579acdf226618f3fb482e675956 Author: David Denoncin <ddenoncin <AT> gmail <DOT> com> AuthorDate: Sat Jul 4 14:26:35 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jul 4 15:24:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4550eaf9
sci-biology/blat: -fno-common fix Closes: https://bugs.gentoo.org/706450 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: David Denoncin <ddenoncin <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16587 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sci-biology/blat/blat-34-r2.ebuild | 7 +++++-- sci-biology/blat/files/blat-34-fno-common.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sci-biology/blat/blat-34-r2.ebuild b/sci-biology/blat/blat-34-r2.ebuild index e10bc367a31..b0724635638 100644 --- a/sci-biology/blat/blat-34-r2.ebuild +++ b/sci-biology/blat/blat-34-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,10 @@ DEPEND="app-arch/unzip" S=${WORKDIR}/${MY_PN} -PATCHES=( "${FILESDIR}"/${PN}-34-fix-build-system.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-34-fix-build-system.patch + "${FILESDIR}"/${PN}-34-fno-common.patch +) src_compile() { tc-export AR CC diff --git a/sci-biology/blat/files/blat-34-fno-common.patch b/sci-biology/blat/files/blat-34-fno-common.patch new file mode 100644 index 00000000000..63a49cf8129 --- /dev/null +++ b/sci-biology/blat/files/blat-34-fno-common.patch @@ -0,0 +1,11 @@ +--- a/inc/htmshell.h ++++ b/inc/htmshell.h +@@ -85,7 +85,7 @@ void htmlBadVar(char *varName); + void htmlImage(char *fileName, int width, int height); + /* Display centered image file. */ + +-jmp_buf htmlRecover; /* Error recovery jump. Exposed for cart's use. */ ++extern jmp_buf htmlRecover; /* Error recovery jump. Exposed for cart's use. */ + + void htmlVaWarn(char *format, va_list args); + /* Write an error message. (Generally you just call warn() or errAbort().
