Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/stacks/
Date: Sun, 30 Apr 2017 13:37:08
Message-Id: 1493559287.2272938e78efe357468c8e1b4c3420f6bfe73284.mmokrejs@gentoo
1 commit: 2272938e78efe357468c8e1b4c3420f6bfe73284
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Sun Apr 30 13:34:47 2017 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Sun Apr 30 13:34:47 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2272938e
7
8 sci-biology/stacks:
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 sci-biology/stacks/stacks-1.44.ebuild | 9 +++++----
13 1 file changed, 5 insertions(+), 4 deletions(-)
14
15 diff --git a/sci-biology/stacks/stacks-1.44.ebuild b/sci-biology/stacks/stacks-1.44.ebuild
16 index a7ac01a1f..a4d473e91 100644
17 --- a/sci-biology/stacks/stacks-1.44.ebuild
18 +++ b/sci-biology/stacks/stacks-1.44.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2016 Gentoo Foundation
21 +# Copyright 1999-2017 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=5
25 @@ -29,15 +29,16 @@ RDEPEND="${DEPEND}
26
27 src_prepare(){
28 sed -e 's/SUBDIRS = htslib/SUBDIRS = /' -i Makefile.am || die
29 - mycppflags=`pkg-config --cflags htslib` # is blocked by bug #601366
30 - sed -e "s#-I./htslib/htslib#-I${mycppflags}#" -i configure.ac || die
31 + #mycppflags=`pkg-config --cflags htslib` # is blocked by bug #601366
32 + if [ -z "$mycppflags" ]; then mycppflags="."; fi
33 + sed -e "s#-I./htslib/htslib#-I/usr/include/bam -I${mycppflags}#" -i configure.ac || die
34 eautoreconf
35 }
36
37 src_configure() {
38 econf --enable-bam --enable-sparsehash
39 webapp_src_preinst
40 - sed -i 's#/usr/lib/libbam.a#-lbam#' Makefile || die
41 + sed -i 's#/usr/lib/libbam.a#-lbam#;#./htslib/libhts.a#-lhts#' Makefile || die
42 }
43
44 src_compile(){