Debian Codegraph @

debian/patches/use_Debian_bwa.patch

raw
1 Description: bwa headers are got through libbwa-dev, not by downloading anything
2 Author: Pierre Gruet <[email protected]>
3 Forwarded: not-needed
4 Last-Update: 2022-03-06
5
6 --- a/src/main/c/Makefile
7 +++ b/src/main/c/Makefile
8 @@ -6,34 +6,20 @@
9 CFLAGS=-ggdb -O2 -Wall -fPIC $(JNI_INCLUDE_DIRS)
10 CC=gcc
11
12 -#OS-dependent extension lookup
13 -UNAME := $(shell uname)
14 -ifeq ($(UNAME),Darwin)
15 -LIB_EXT=Darwin.dylib
16 -else
17 -LIB_EXT=Linux.so
18 -endif
19 +LIB_EXT=so
20
21 -BWA_MEM_COMMIT=cb950614ce7217788780b9a8d445c64cd4d8f62e
22 JNI_BASE_NAME=org_broadinstitute_hellbender_utils_bwa_BwaMemIndex
23
24 all: libbwa.$(LIB_EXT)
25
26 -libbwa.$(LIB_EXT): $(JNI_BASE_NAME).o jnibwa.o bwa/libbwa.a
27 +libbwa.$(LIB_EXT): $(JNI_BASE_NAME).o jnibwa.o /usr/lib/libbwa.a
28 $(CC) -ggdb -dynamiclib -shared -o $@ $^ -lm -lz -lpthread
29
30 -bwa:
31 - git clone https://github.com/lh3/bwa && cd bwa && git checkout $(BWA_MEM_COMMIT) && echo '#define BWA_COMMIT "'$(BWA_MEM_COMMIT)'"' > bwa_commit.h
32 - sed -i.bak -e's/\(LOBJS=.*\)/\1 bwtindex.o rle.o rope.o bwt.o is.o/g' bwa/Makefile
33 +$(JNI_BASE_NAME).o: $(JNI_BASE_NAME).c jnibwa.h
34
35 -bwa/libbwa.a: bwa
36 - $(MAKE) CFLAGS="$(CFLAGS)" -C bwa libbwa.a
37 -
38 -$(JNI_BASE_NAME).o: $(JNI_BASE_NAME).c jnibwa.h bwa
39 -
40 -jnibwa.o: jnibwa.c jnibwa.h bwa
41 +jnibwa.o: jnibwa.c jnibwa.h
42
43 clean:
44 - rm -rf bwa *.o *.$(LIB_EXT)
45 + rm -rf *.o *.$(LIB_EXT)
46
47 .PHONY: all clean
48 --- a/src/main/c/jnibwa.c
49 +++ b/src/main/c/jnibwa.c
50 @@ -15,12 +15,12 @@
51 #include <errno.h>
52
53 #include "jnibwa.h"
54 -#include "bwa/kstring.h"
55 -#include "bwa/bntseq.h"
56 -#include "bwa/bwt.h"
57 -#include "bwa/utils.h"
58 -#include "bwa/rle.h"
59 -#include "bwa/rope.h"
60 +#include <bwa/kstring.h>
61 +#include <bwa/bntseq.h>
62 +#include <bwa/bwt.h>
63 +#include <bwa/utils.h>
64 +#include <bwa/rle.h>
65 +#include <bwa/rope.h>
66
67
68 static inline void kput32( int32_t val, kstring_t* str ) {
69 --- a/src/main/c/jnibwa.h
70 +++ b/src/main/c/jnibwa.h
71 @@ -5,7 +5,7 @@
72 #ifndef JNIBWA_H_
73 #define JNIBWA_H_
74
75 -#include "bwa/bwamem.h"
76 +#include <bwa/bwamem.h>
77
78
79 int jnibwa_createReferenceIndex( char const* refFileName, char const* indexPrefix, char const* algoName);
80 --- a/src/main/java/org/broadinstitute/hellbender/utils/bwa/BwaMemIndex.java
81 +++ b/src/main/java/org/broadinstitute/hellbender/utils/bwa/BwaMemIndex.java
82 @@ -450,7 +450,7 @@
83 "Set property LIBBWA_PATH to point to a native library for your architecture.");
84 }
85 if ( osName.startsWith("MAC") ) libName = "/libbwa.Darwin.dylib";
86 - else if ( osName.startsWith("LINUX") ) libName = "/libbwa.Linux.so";
87 + else if ( osName.startsWith("LINUX") ) libName = "/libbwa.so";
88 else {
89 throw new IllegalStateException(
90 "We have pre-built fermi-lite binaries only for Linux and Mac. "+
91 --- a/src/main/c/org_broadinstitute_hellbender_utils_bwa_BwaMemIndex.c
92 +++ b/src/main/c/org_broadinstitute_hellbender_utils_bwa_BwaMemIndex.c
93 @@ -2,7 +2,6 @@
94 #include <fcntl.h>
95 #include <stdlib.h>
96 #include "jnibwa.h"
97 -#include "bwa/bwa_commit.h"
98
99
100 char * jstring_to_chars(JNIEnv* env, jstring in) {