Description: bwa headers are got through libbwa-dev, not by downloading anything Author: Pierre Gruet Forwarded: not-needed Last-Update: 2022-03-06 --- a/src/main/c/Makefile +++ b/src/main/c/Makefile @@ -6,34 +6,20 @@ CFLAGS=-ggdb -O2 -Wall -fPIC $(JNI_INCLUDE_DIRS) CC=gcc -#OS-dependent extension lookup -UNAME := $(shell uname) -ifeq ($(UNAME),Darwin) -LIB_EXT=Darwin.dylib -else -LIB_EXT=Linux.so -endif +LIB_EXT=so -BWA_MEM_COMMIT=cb950614ce7217788780b9a8d445c64cd4d8f62e JNI_BASE_NAME=org_broadinstitute_hellbender_utils_bwa_BwaMemIndex all: libbwa.$(LIB_EXT) -libbwa.$(LIB_EXT): $(JNI_BASE_NAME).o jnibwa.o bwa/libbwa.a +libbwa.$(LIB_EXT): $(JNI_BASE_NAME).o jnibwa.o /usr/lib/libbwa.a $(CC) -ggdb -dynamiclib -shared -o $@ $^ -lm -lz -lpthread -bwa: - git clone https://github.com/lh3/bwa && cd bwa && git checkout $(BWA_MEM_COMMIT) && echo '#define BWA_COMMIT "'$(BWA_MEM_COMMIT)'"' > bwa_commit.h - sed -i.bak -e's/\(LOBJS=.*\)/\1 bwtindex.o rle.o rope.o bwt.o is.o/g' bwa/Makefile +$(JNI_BASE_NAME).o: $(JNI_BASE_NAME).c jnibwa.h -bwa/libbwa.a: bwa - $(MAKE) CFLAGS="$(CFLAGS)" -C bwa libbwa.a - -$(JNI_BASE_NAME).o: $(JNI_BASE_NAME).c jnibwa.h bwa - -jnibwa.o: jnibwa.c jnibwa.h bwa +jnibwa.o: jnibwa.c jnibwa.h clean: - rm -rf bwa *.o *.$(LIB_EXT) + rm -rf *.o *.$(LIB_EXT) .PHONY: all clean --- a/src/main/c/jnibwa.c +++ b/src/main/c/jnibwa.c @@ -15,12 +15,12 @@ #include #include "jnibwa.h" -#include "bwa/kstring.h" -#include "bwa/bntseq.h" -#include "bwa/bwt.h" -#include "bwa/utils.h" -#include "bwa/rle.h" -#include "bwa/rope.h" +#include +#include +#include +#include +#include +#include static inline void kput32( int32_t val, kstring_t* str ) { --- a/src/main/c/jnibwa.h +++ b/src/main/c/jnibwa.h @@ -5,7 +5,7 @@ #ifndef JNIBWA_H_ #define JNIBWA_H_ -#include "bwa/bwamem.h" +#include int jnibwa_createReferenceIndex( char const* refFileName, char const* indexPrefix, char const* algoName); --- a/src/main/java/org/broadinstitute/hellbender/utils/bwa/BwaMemIndex.java +++ b/src/main/java/org/broadinstitute/hellbender/utils/bwa/BwaMemIndex.java @@ -450,7 +450,7 @@ "Set property LIBBWA_PATH to point to a native library for your architecture."); } if ( osName.startsWith("MAC") ) libName = "/libbwa.Darwin.dylib"; - else if ( osName.startsWith("LINUX") ) libName = "/libbwa.Linux.so"; + else if ( osName.startsWith("LINUX") ) libName = "/libbwa.so"; else { throw new IllegalStateException( "We have pre-built fermi-lite binaries only for Linux and Mac. "+ --- a/src/main/c/org_broadinstitute_hellbender_utils_bwa_BwaMemIndex.c +++ b/src/main/c/org_broadinstitute_hellbender_utils_bwa_BwaMemIndex.c @@ -2,7 +2,6 @@ #include #include #include "jnibwa.h" -#include "bwa/bwa_commit.h" char * jstring_to_chars(JNIEnv* env, jstring in) {