From: | "Samuli Suominen (drac)" <drac@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-p2p/hrktorrent/files: hrktorrent-0.2.2-Makefile.patch |
Date: | Mon, 26 Nov 2007 19:32:57 |
Message-Id: | E1IwjhH-0000Oy-KG@stork.gentoo.org |
1 | drac 07/11/26 19:32:47 |
2 | |
3 | Added: hrktorrent-0.2.2-Makefile.patch |
4 | Log: |
5 | Makefile was confusing LDFLAGS with LIBS, CFLAGS with CXXFLAGS, add a patch for it. Keyword ~amd64 wrt #200409. |
6 | (Portage version: 2.1.4_rc3) |
7 | |
8 | Revision Changes Path |
9 | 1.1 net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: hrktorrent-0.2.2-Makefile.patch |
15 | =================================================================== |
16 | diff -ur hrktorrent-0.2.2.orig/Makefile hrktorrent-0.2.2/Makefile |
17 | --- hrktorrent-0.2.2.orig/Makefile 2007-11-25 17:17:16.000000000 +0200 |
18 | +++ hrktorrent-0.2.2/Makefile 2007-11-26 21:26:51.000000000 +0200 |
19 | @@ -1,17 +1,17 @@ |
20 | -C = g++ |
21 | +CXX = g++ |
22 | OBJ = main.o core.o settings.o utils.o |
23 | OUT = hrktorrent |
24 | |
25 | -CFLAGS = `pkg-config --cflags libtorrent` -O2 -pipe |
26 | -LDFLAGS = `pkg-config --libs libtorrent` -lpthread |
27 | +CXXFLAGS += `pkg-config --cflags libtorrent` |
28 | +LIBS = `pkg-config --libs libtorrent` -lpthread |
29 | |
30 | all: $(OUT) |
31 | |
32 | %.o: %.cpp |
33 | - $(C) -c -o $@ $< |
34 | + $(CXX) $(CXXFLAGS) -c -o $@ $< |
35 | |
36 | $(OUT): $(OBJ) |
37 | - $(C) $(LDFLAGS) $(OBJ) -o $(OUT) |
38 | + $(CXX) $(LDFLAGS) $(OBJ) $(LIBS) -o $(OUT) |
39 | |
40 | clean: |
41 | rm -rf $(OBJ) $(OUT) |
42 | |
43 | |
44 | |
45 | -- |
46 | gentoo-commits@g.o mailing list |