[mmseq/f16] Fix cxxflags patch
verdurin
verdurin at fedoraproject.org
Fri Oct 7 15:13:58 UTC 2011
commit 0278f5049911031e2c4cc035495b2f0025871830
Author: Adam Huffman <bloch at verdurin.com>
Date: Fri Oct 7 16:13:42 2011 +0100
Fix cxxflags patch
mmseq-flags.patch | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
---
diff --git a/mmseq-flags.patch b/mmseq-flags.patch
index 0b45e42..b3c361c 100644
--- a/mmseq-flags.patch
+++ b/mmseq-flags.patch
@@ -1,27 +1,11 @@
-diff -ur mmseq_0.9.9/Makefile mmseq_0.9.9.new/Makefile
---- mmseq_0.9.9/Makefile 2011-03-18 00:25:53.000000000 +0000
-+++ mmseq_0.9.9.new/Makefile 2011-04-09 16:46:16.445406767 +0100
-@@ -26,19 +26,19 @@
- .PHONY : all
-
- 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}
-
- static: sokal.o mmseq.cpp
- $(CXX) ${MACROS} ${STATICFLAG} -fopenmp -O3 sokal.o mmseq.cpp -o ${STATICBIN} ${STATICLIBS}
-
- sokal.o : sokal.cc sokal.hh
-- $(CXX) -c sokal.cc
-+ $(CXX) $(CXXFLAGS) -c sokal.cc
+--- mmseq_0.9.14/Makefile 2011-09-20 11:27:55.000000000 +0100
++++ mmseq_0.9.14.new/Makefile 2011-10-07 16:13:01.261226334 +0100
+@@ -35,7 +35,7 @@
+ $(CXX) $(CXXFLAGS) -c sokal.cc
fasta.o : fasta.c fasta.h
- $(CC) -c fasta.c
+ $(CC) $(CXXFLAGS) -c fasta.c
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}
-
- hpc : mmseq_hpc bam2hits_hpc
- .PHONY : all
+ ${CXX} ${MACROS} $(CXXFLAGS) -fopenmp -O3 fasta.o bam2hits.cpp -o bam2hits ${LIBS_B2H}
More information about the scm-commits
mailing list