[mmseq/el5] Use boost141 on EPEL5

verdurin verdurin at fedoraproject.org
Fri Jun 17 15:20:38 UTC 2011


commit 82572ebbb9c6c54be415d5dc214cab8c208dc61c
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Jun 17 16:20:11 2011 +0100

    Use boost141 on EPEL5

 mmseq-flags.patch |    4 ++--
 mmseq.spec        |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mmseq-flags.patch b/mmseq-flags.patch
index 0b45e42..7d24fc2 100644
--- a/mmseq-flags.patch
+++ b/mmseq-flags.patch
@@ -6,7 +6,7 @@ diff -ur mmseq_0.9.9/Makefile mmseq_0.9.9.new/Makefile
  
  mmseq : sokal.o mmseq.cpp
 -	$(CXX) ${MACROS} -fopenmp -O3 sokal.o mmseq.cpp -o mmseq ${LIBS}
-+	$(CXX) ${MACROS} $(CXXFLAGS) -fopenmp sokal.o mmseq.cpp -o mmseq ${LIBS}
++	$(CXX) ${MACROS} $(CXXFLAGS) -I/usr/include/boost141 -fopenmp sokal.o mmseq.cpp -o mmseq ${LIBS} -L/usr/lib64/boost141 -L/usr/lib/boost141
  
  static: sokal.o mmseq.cpp
  	$(CXX) ${MACROS} ${STATICFLAG} -fopenmp -O3 sokal.o mmseq.cpp -o ${STATICBIN} ${STATICLIBS}
@@ -21,7 +21,7 @@ diff -ur mmseq_0.9.9/Makefile mmseq_0.9.9.new/Makefile
  
  bam2hits : fasta.o bam2hits.cpp
 -	${CXX} ${MACROS} -fopenmp -O3 fasta.o bam2hits.cpp -o bam2hits ${LIBS_B2H}
-+	${CXX} ${MACROS} $(CXXFLAGS) -fopenmp fasta.o bam2hits.cpp -o bam2hits ${LIBS_B2H}
++	${CXX} ${MACROS} $(CXXFLAGS) -fopenmp -I/usr/include/boost141 fasta.o bam2hits.cpp -o bam2hits ${LIBS_B2H} -L/usr/lib64/boost141 -L/usr/lib/boost141
  
  hpc : mmseq_hpc bam2hits_hpc
  .PHONY : all
diff --git a/mmseq.spec b/mmseq.spec
index 15a38a0..28be71f 100644
--- a/mmseq.spec
+++ b/mmseq.spec
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 17 2011 Adam Huffman <bloch at verdurin.com> - 0.9.11-1
+- use boost141 on EPEL5
+
 * Sat May 28 2011 Adam Huffman <bloch at verdurin.com> - 0.9.11-1
 - new upstream release
 - add routeB.sh script


More information about the scm-commits mailing list