commit: 9abaa3304eb07a14b179b925cffd428a8ffd4681 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Feb 20 20:52:34 2021 +0000 Commit: Jakov Smolić <jakov.smolic <AT> sartura <DOT> hr> CommitDate: Sat Feb 20 21:57:41 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9abaa330
sci-biology/grappa: Apply gcc-10 workaround Closes: https://bugs.gentoo.org/755311 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> sci-biology/grappa/files/grappa-2.0-inline.patch | 18 ++++++++++++++++++ sci-biology/grappa/grappa-2.0.ebuild | 9 +++++++++ 2 files changed, 27 insertions(+) diff --git a/sci-biology/grappa/files/grappa-2.0-inline.patch b/sci-biology/grappa/files/grappa-2.0-inline.patch new file mode 100644 index 000000000..a78f394e6 --- /dev/null +++ b/sci-biology/grappa/files/grappa-2.0-inline.patch @@ -0,0 +1,18 @@ +--- a/greedy_median.c ++++ b/greedy_median.c +@@ -7,7 +7,6 @@ + chosen, including the original */ + + /* i->succ1[i] is the chosen adjacency */ +-INLINE int + finish1 ( int i, int *count, int *degree, int *succ1, int *succ2, + int *pred1, int *pred2, int *tour, int *otherEnd, int num_genes ) + { +@@ -82,7 +81,6 @@ finish1 ( int i, int *count, int *degree, int *succ1, int *succ2, + + + /* i->succ2[i] is the chosen adjacency */ +-INLINE int + finish2 ( int i, int *count, int *degree, int *succ1, int *succ2, + int *pred1, int *pred2, int *tour, int *otherEnd, int num_genes ) + { diff --git a/sci-biology/grappa/grappa-2.0.ebuild b/sci-biology/grappa/grappa-2.0.ebuild index ceb0c34c9..df0392717 100644 --- a/sci-biology/grappa/grappa-2.0.ebuild +++ b/sci-biology/grappa/grappa-2.0.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit flag-o-matic + MY_P="GRAPPA20" DESCRIPTION="Genome Rearrangements Analysis under Parsimony and other Phylogenetic Algorithms" @@ -15,11 +17,18 @@ KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${P}-inline.patch ) + src_prepare() { default sed -i -e '/CFLAGS := -mcpu/ d' -e 's/\(CFLAGS := -D${OS}\)/\1 ${CFLAGS}/' "${S}/Makefile" || die } +src_configure() { + append-cflags -fcommon + default +} + src_install() { dobin grappa dosym grappa /usr/bin/invdist
