diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-06-22 01:25:12 -0400 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-06-25 18:59:09 +0200 |
| commit | 535d49953c74af2bb58478979d77d5588acaca20 (patch) | |
| tree | eb79e454219c2381b930afe26f2936b757e9de65 /sci-biology | |
| parent | app-text/kbibtex: Drop USE=webkit (diff) | |
| download | gentoo-535d49953c74af2bb58478979d77d5588acaca20.tar.gz gentoo-535d49953c74af2bb58478979d77d5588acaca20.tar.bz2 gentoo-535d49953c74af2bb58478979d77d5588acaca20.zip | |
sci-biology/cufflinks: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594904
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4969
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild | 3 | ||||
| -rw-r--r-- | sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild index 9ff0a2c71112..3e89f70a498e 100644 --- a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild +++ b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-samtools-legacy.patch "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-gcc6.patch ) src_prepare() { diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch new file mode 100644 index 000000000000..6ee9bcf456d4 --- /dev/null +++ b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch @@ -0,0 +1,14 @@ +--- a/src/lemon/error.h ++++ b/src/lemon/error.h +@@ -67,9 +67,9 @@ + } + + ExceptionMember& operator=(const ExceptionMember& copy) { +- if (ptr.get() == 0) return; ++ if (ptr.get() == 0) return *this; + try { +- if (!copy.valid()) return; ++ if (!copy.valid()) return *this; + *ptr = copy.get(); + } catch (...) {} + } |