edit build.sh

bioconda · Nov 14, 2024 · 894b3f5 · 894b3f5
1 parent 1cb5cfb
commit 894b3f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/recipes/muse/0001-Makefile.patch b/recipes/muse/0001-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 5edd6e1..5e0c9df 100755
+index 5edd6e1..78d946c 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,6 @@
@@ -27,7 +27,7 @@ index 5edd6e1..5e0c9df 100755
  #
  # Common flags
  COMMONFLAGS += $(INCLUDES)
-@@ -24,13 +24,13 @@ COMMONFLAGS += $(INCLUDES)
+@@ -24,7 +24,7 @@ COMMONFLAGS += $(INCLUDES)
  CXXFLAGS += $(COMMONFLAGS)
  CFLAGS += $(COMMONFLAGS)
  CPPFLAGS += $(COMMONFLAGS)
@@ -36,13 +36,6 @@ index 5edd6e1..5e0c9df 100755
 
  #LIBS += $(COMMONLIBS) -ltcmalloc
  LIBS += $(COMMONLIBS)
-
- TARGET = MuSE
--LINKLINE = $(LINK) -O3 -g -o $(TARGET) $(OBJS) $(COMMONOBJS) $(MATCHOBJS) $(LIBS)
-+LINKLINE = $(LINK) -O3 -g -o $(TARGET) $(OBJS) $(COMMONOBJS) $(MATCHOBJS) $(INCLUDES) $(LIBS)
- OPENMP= -fopenmp
-
- #all:
 @@ -38,10 +38,10 @@ all: $(TARGET)
  .SUFFIXES: .c .cpp .o
 

diff --git a/recipes/muse/fix-install_muse.sh.patch b/recipes/muse/fix-install_muse.sh.patch
@@ -1,5 +1,5 @@
 diff --git a/install_muse.sh b/install_muse.sh
-index 7bc2153..8dd8a0a 100755
+index 7bc2153..a1dfcd3 100755
 --- a/install_muse.sh
 +++ b/install_muse.sh
 @@ -5,12 +5,14 @@ make clean
@@ -38,14 +38,9 @@ index 7bc2153..8dd8a0a 100755
  cd ..
 
  # combine htslib
-@@ -39,30 +41,18 @@ fi
-
- git clone https://github.com/samtools/htslib.git
- cd htslib
--git checkout 1.9
--#git submodule update --init --recursive
-+git checkout 1.21
-+git submodule update --init --recursive
+@@ -42,27 +44,15 @@ cd htslib
+ git checkout 1.9
+ #git submodule update --init --recursive
  autoreconf -i
 -./configure
 -make -j4