Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-arcade/blobwars/files: blobwars-1.19-ldflags.patch blobwars-1.19-linking-order.patch
Date: Mon, 29 Aug 2011 18:43:18
Message-Id: 20110829184308.C55F120051@flycatcher.gentoo.org
1 pacho 11/08/29 18:43:08
2
3 Added: blobwars-1.19-ldflags.patch
4 blobwars-1.19-linking-order.patch
5 Log:
6 Initial commit, bug #260843
7
8 (Portage version: 2.1.10.11/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 games-arcade/blobwars/files/blobwars-1.19-ldflags.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch?rev=1.1&content-type=text/plain
15
16 Index: blobwars-1.19-ldflags.patch
17 ===================================================================
18 --- makefile~ 2011-08-29 20:32:22.000000000 +0200
19 +++ makefile 2011-08-29 20:33:27.052159159 +0200
20 @@ -82,16 +82,16 @@
21
22 # linking the program.
23 $(PROG): $(GAMEOBJS)
24 - $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
25 + $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
26
27 pak: $(PAKOBJS)
28 - $(CXX) $(PAKOBJS) -o pak $(LIBS)
29 + $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak $(LIBS)
30
31 %.mo: %.po
32 msgfmt -c -o $@ $<
33
34 mapeditor: $(MAPOBJS)
35 - $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
36 + $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor $(LIBS)
37
38 # cleaning everything that can be automatically recreated with "make".
39 clean:
40
41
42
43 1.1 games-arcade/blobwars/files/blobwars-1.19-linking-order.patch
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch?rev=1.1&content-type=text/plain
47
48 Index: blobwars-1.19-linking-order.patch
49 ===================================================================
50 From 896cde549eeb254cc4960f20f54cab845e95b061 Mon Sep 17 00:00:00 2001
51 From: Andreas Moog <amoog@××××××.com>
52 Date: Sun, 19 Jun 2011 22:03:10 +0200
53 Subject: [PATCH] LIBS go after objects to allow linking with ld --as-needed
54
55 ---
56 makefile | 6 +++---
57 1 files changed, 3 insertions(+), 3 deletions(-)
58
59 diff --git a/makefile b/makefile
60 index 0a9cc94..509c2ff 100755
61 --- a/makefile
62 +++ b/makefile
63 @@ -82,16 +82,16 @@ all: $(ALL)
64
65 # linking the program.
66 $(PROG): $(GAMEOBJS)
67 - $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
68 + $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
69
70 pak: $(PAKOBJS)
71 - $(CXX) $(LIBS) $(PAKOBJS) -o pak
72 + $(CXX) $(PAKOBJS) -o pak $(LIBS)
73
74 %.mo: %.po
75 msgfmt -c -o $@ $<
76
77 mapeditor: $(MAPOBJS)
78 - $(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
79 + $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
80
81 # cleaning everything that can be automatically recreated with "make".
82 clean:
83 --
84 1.7.5.4