Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bwa/, sci-biology/bwa/files/
Date: Sat, 26 Sep 2020 10:01:05
Message-Id: 1601114445.11e7107dfc5e8b95c3af3887c388fa1272b8ddb2.soap@gentoo
1 commit: 11e7107dfc5e8b95c3af3887c388fa1272b8ddb2
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 10:00:45 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 10:00:45 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e7107d
7
8 sci-biology/bwa: Bump version to 0.7.17
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sci-biology/bwa/Manifest | 1 +
14 sci-biology/bwa/bwa-0.7.17.ebuild | 39 +++++++++++++++++++++++
15 sci-biology/bwa/files/bwa-0.7.17-Makefile.patch | 42 +++++++++++++++++++++++++
16 sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch | 11 +++++++
17 4 files changed, 93 insertions(+)
18
19 diff --git a/sci-biology/bwa/Manifest b/sci-biology/bwa/Manifest
20 index 9da3adbeb40..4b69e7f0403 100644
21 --- a/sci-biology/bwa/Manifest
22 +++ b/sci-biology/bwa/Manifest
23 @@ -1 +1,2 @@
24 DIST bwa-0.7.16a.tar.bz2 190773 BLAKE2B e1064381b6b1aa4c9b78d12222c7b783a55676a163b94ad8596a2af64c9b0d60bbebd8e840aaa13b25e1ca4f10466c2c39c99830f1ca58e558d724d1ad583944 SHA512 8bbe223f79efd328d66adb88baf995e894f5944aad912ac1b464dc84dc9b4e22ddf77b60dcbe468e0eedc344ee58d08dc498777f0d2794a2c1e0ddd33dad606d
25 +DIST bwa-0.7.17.tar.gz 232593 BLAKE2B fa48aad72a47547d66c767e2e2a5aadfcfc7c77c517410812230f51a2222ee66bb04383b068036b696af0a57b04b35e97bed11e3c44793aa899a8c0807f3df5e SHA512 114e61b7cc5edcb67172d1eca7be1fa670ea33dd48b5c02c98318e254871363775c0dab327fd7ee7023200a5fedc745fa01cbe0fd9550d783f091d4df6926f48
26
27 diff --git a/sci-biology/bwa/bwa-0.7.17.ebuild b/sci-biology/bwa/bwa-0.7.17.ebuild
28 new file mode 100644
29 index 00000000000..3da06fd74f9
30 --- /dev/null
31 +++ b/sci-biology/bwa/bwa-0.7.17.ebuild
32 @@ -0,0 +1,39 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit toolchain-funcs
39 +
40 +DESCRIPTION="Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner"
41 +HOMEPAGE="https://github.com/lh3/bwa/"
42 +SRC_URI="https://github.com/lh3/bwa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
43 +
44 +LICENSE="GPL-3"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~x86 ~x64-macos"
47 +
48 +DEPEND="sys-libs/zlib"
49 +RDEPEND="
50 + ${DEPEND}
51 + dev-lang/perl"
52 +
53 +PATCHES=(
54 + "${FILESDIR}"/${PN}-0.7.17-Makefile.patch
55 + "${FILESDIR}"/${PN}-0.7.17-gcc-10.patch
56 +)
57 +DOCS=( NEWS.md README-alt.md README.md )
58 +
59 +src_configure() {
60 + tc-export CC AR
61 +}
62 +
63 +src_install() {
64 + dobin bwa
65 +
66 + exeinto /usr/libexec/${PN}
67 + doexe qualfa2fq.pl xa2multi.pl
68 +
69 + einstalldocs
70 + doman bwa.1
71 +}
72
73 diff --git a/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch b/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch
74 new file mode 100644
75 index 00000000000..944369cb75e
76 --- /dev/null
77 +++ b/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch
78 @@ -0,0 +1,42 @@
79 +--- a/Makefile
80 ++++ b/Makefile
81 +@@ -1,9 +1,7 @@
82 +-CC= gcc
83 + #CC= clang --analyze
84 +-CFLAGS= -g -Wall -Wno-unused-function -O2
85 ++CFLAGS+= -Wall -Wno-unused-function
86 + WRAP_MALLOC=-DUSE_MALLOC_WRAPPERS
87 +-AR= ar
88 +-DFLAGS= -DHAVE_PTHREAD $(WRAP_MALLOC)
89 ++CPPFLAGS+= -DHAVE_PTHREAD $(WRAP_MALLOC)
90 + LOBJS= utils.o kthread.o kstring.o ksw.o bwt.o bntseq.o bwa.o bwamem.o bwamem_pair.o bwamem_extra.o malloc_wrap.o \
91 + QSufSort.o bwt_gen.o rope.o rle.o is.o bwtindex.o
92 + AOBJS= bwashm.o bwase.o bwaseqio.o bwtgap.o bwtaln.o bamlite.o \
93 +@@ -21,16 +19,13 @@
94 +
95 + .SUFFIXES:.c .o .cc
96 +
97 +-.c.o:
98 +- $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
99 +-
100 + all:$(PROG)
101 +
102 + bwa:libbwa.a $(AOBJS) main.o
103 +- $(CC) $(CFLAGS) $(DFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
104 ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
105 +
106 + bwamem-lite:libbwa.a example.o
107 +- $(CC) $(CFLAGS) $(DFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
108 ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
109 +
110 + libbwa.a:$(LOBJS)
111 + $(AR) -csru $@ $(LOBJS)
112 +@@ -39,7 +34,7 @@
113 + rm -f gmon.out *.o a.out $(PROG) *~ *.a
114 +
115 + depend:
116 +- ( LC_ALL=C ; export LC_ALL; makedepend -Y -- $(CFLAGS) $(DFLAGS) -- *.c )
117 ++ ( LC_ALL=C ; export LC_ALL; makedepend -Y -- $(CFLAGS) $(CPPFLAGS) -- *.c )
118 +
119 + # DO NOT DELETE THIS LINE -- make depend depends on it.
120 +
121
122 diff --git a/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch b/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch
123 new file mode 100644
124 index 00000000000..1babb8356c4
125 --- /dev/null
126 +++ b/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch
127 @@ -0,0 +1,11 @@
128 +--- a/rle.h
129 ++++ b/rle.h
130 +@@ -30,7 +30,7 @@
131 + *** 43+3 codec ***
132 + ******************/
133 +
134 +-const uint8_t rle_auxtab[8];
135 ++extern const uint8_t rle_auxtab[8];
136 +
137 + #define RLE_MIN_SPACE 18
138 + #define rle_nptr(block) ((uint16_t*)(block))