Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-biology/cd-hit/files: 4.5.1-gentoo.patch
Date: Tue, 01 Feb 2011 09:06:45
Message-Id: 20110201090635.5A4CC20057@flycatcher.gentoo.org
1 jlec 11/02/01 09:06:35
2
3 Added: 4.5.1-gentoo.patch
4 Log:
5 New addition, written by me
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-biology/cd-hit/files/4.5.1-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/cd-hit/files/4.5.1-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/cd-hit/files/4.5.1-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: 4.5.1-gentoo.patch
16 ===================================================================
17 diff --git a/Makefile b/Makefile
18 index f1eaa26..92d3130 100644
19 --- a/Makefile
20 +++ b/Makefile
21 @@ -10,7 +10,7 @@ CCFLAGS = -O2 -DNO_OPENMP
22 # in command line:
23 # make openmp=yes
24 ifeq ($(openmp),yes)
25 -CCFLAGS = -O2 -fopenmp
26 +CXXFLAGS += -fopenmp
27 endif
28
29 # support debugging
30 @@ -18,16 +18,16 @@ endif
31 # make debug=yes
32 # make openmp=yes debug=yes
33 ifeq ($(debug),yes)
34 -CCFLAGS += -ggdb
35 +CXXFLAGS += -ggdb
36 endif
37
38 #LDFLAGS = -static -o
39 -LDFLAGS = -o
40 +LDFLAGS += -o
41
42 PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div
43
44 .c++.o:
45 - $(CC) $(CCFLAGS) -c $<
46 + $(CXX) $(CXXFLAGS) -c $<
47
48 all: $(PROGS)
49
50 @@ -37,39 +37,39 @@ clean:
51 # programs
52
53 cd-hit: cdhit-common.o cdhit-utility.o cdhit.o
54 - $(CC) $(CCFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit
55 + $(CXX) $(CXXFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit
56
57 cd-hit-2d: cdhit-common.o cdhit-utility.o cdhit-2d.o
58 - $(CC) $(CCFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d
59 + $(CXX) $(CXXFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d
60
61 cd-hit-est: cdhit-common.o cdhit-utility.o cdhit-est.o
62 - $(CC) $(CCFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est
63 + $(CXX) $(CXXFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est
64
65 cd-hit-est-2d: cdhit-common.o cdhit-utility.o cdhit-est-2d.o
66 - $(CC) $(CCFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d
67 + $(CXX) $(CXXFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d
68
69 cd-hit-div: cdhit-common.o cdhit-utility.o cdhit-div.o
70 - $(CC) $(CCFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div
71 + $(CXX) $(CXXFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div
72
73 # objects
74 cdhit-common.o: cdhit-common.c++ cdhit-common.h
75 - $(CC) $(CCFLAGS) cdhit-common.c++ -c
76 + $(CXX) $(CXXFLAGS) cdhit-common.c++ -c
77
78 cdhit-utility.o: cdhit-utility.c++ cdhit-utility.h
79 - $(CC) $(CCFLAGS) cdhit-utility.c++ -c
80 + $(CXX) $(CXXFLAGS) cdhit-utility.c++ -c
81
82 cdhit.o: cdhit.c++ cdhit-utility.h
83 - $(CC) $(CCFLAGS) cdhit.c++ -c
84 + $(CXX) $(CXXFLAGS) cdhit.c++ -c
85
86 cdhit-2d.o: cdhit-2d.c++ cdhit-utility.h
87 - $(CC) $(CCFLAGS) cdhit-2d.c++ -c
88 + $(CXX) $(CXXFLAGS) cdhit-2d.c++ -c
89
90 cdhit-est.o: cdhit-est.c++ cdhit-utility.h
91 - $(CC) $(CCFLAGS) cdhit-est.c++ -c
92 + $(CXX) $(CXXFLAGS) cdhit-est.c++ -c
93
94 cdhit-est-2d.o: cdhit-est-2d.c++ cdhit-utility.h
95 - $(CC) $(CCFLAGS) cdhit-est-2d.c++ -c
96 + $(CXX) $(CXXFLAGS) cdhit-est-2d.c++ -c
97
98 cdhit-div.o: cdhit-div.c++ cdhit-common.h
99 - $(CC) $(CCFLAGS) cdhit-div.c++ -c
100 + $(CXX) $(CXXFLAGS) cdhit-div.c++ -c