Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-roguelike/powder/files: powder-114-make.patch
Date: Thu, 03 Jun 2010 16:41:48
Message-Id: 20100603164144.EC4BB2CF44@corvid.gentoo.org
1 mr_bones_ 10/06/03 16:41:44
2
3 Added: powder-114-make.patch
4 Log:
5 version bump
6 (Portage version: 2.1.8.3/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-roguelike/powder/files/powder-114-make.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/powder/files/powder-114-make.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/powder/files/powder-114-make.patch?rev=1.1&content-type=text/plain
13
14 Index: powder-114-make.patch
15 ===================================================================
16 diff -ru powder113_src.orig/make/makerules powder113_src/make/makerules
17 --- powder113_src.orig/make/makerules 2009-02-05 20:11:41.000000000 -0500
18 +++ powder113_src/make/makerules 2010-05-03 20:38:32.579540189 -0400
19 @@ -8,7 +8,7 @@
20 all: $(TARGET)
21
22 $(TARGET): $(OFILES)
23 - $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
24 + $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS) $(LDFLAGS)
25
26 clean:
27 $(RM) $(OFILES)
28 diff -ru powder113_src.orig/make/makerules.LINUX powder113_src/make/makerules.LINUX
29 --- powder113_src.orig/make/makerules.LINUX 2009-01-18 19:54:09.000000000 -0500
30 +++ powder113_src/make/makerules.LINUX 2010-05-03 20:39:11.022462202 -0400
31 @@ -13,8 +13,8 @@
32 # and is to try and ensure we end up with a static link
33 # of stdc++.
34 $(RM) libstdc++.a
35 - ln -s `g++ -print-file-name=libstdc++.a`
36 - $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
37 + ln -s `$(CXX) -print-file-name=libstdc++.a`
38 + $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
39
40 clean:
41 $(RM) $(OFILES)
42 diff -ru powder113_src.orig/port/linux/Makefile powder113_src/port/linux/Makefile
43 --- powder113_src.orig/port/linux/Makefile 2009-05-13 19:32:42.000000000 -0400
44 +++ powder113_src/port/linux/Makefile 2010-05-03 20:40:57.629463531 -0400
45 @@ -48,7 +48,7 @@
46 all: $(TARGET)
47
48 powder: premake $(OFILES)
49 - $(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
50 + $(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
51
52 .cpp.o:
53 $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
54 @@ -60,7 +60,7 @@
55 # of stdc++.
56 $(RM) libstdc++.a
57 ln -s `g++ -print-file-name=libstdc++.a`
58 - $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
59 + $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
60
61 clean:
62 $(RM) $(OFILES)