From: | "Alfredo Tupone (tupone)" <tupone@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in games-fps/tremulous/files: tremulous-1.1.0-ldflags.patch |
Date: | Thu, 09 Sep 2010 09:44:21 |
Message-Id: | 20100909094415.AD58E20051@flycatcher.gentoo.org |
1 | tupone 10/09/09 09:44:15 |
2 | |
3 | Added: tremulous-1.1.0-ldflags.patch |
4 | Log: |
5 | Respect LDFLAGS. Bug #336261 |
6 | (Portage version: 2.1.8.3/cvs/Linux i686) |
7 | |
8 | Revision Changes Path |
9 | 1.1 games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch |
10 | |
11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: tremulous-1.1.0-ldflags.patch |
15 | =================================================================== |
16 | --- Makefile.old 2010-09-09 11:30:26.000000000 +0200 |
17 | +++ Makefile 2010-09-09 11:33:41.000000000 +0200 |
18 | @@ -253,7 +253,7 @@ |
19 | SHLIBLDFLAGS=-shared $(LDFLAGS) |
20 | |
21 | THREAD_LDFLAGS=-lpthread |
22 | - LDFLAGS=-ldl -lm |
23 | + LDLIBS=-ldl -lm |
24 | |
25 | ifeq ($(USE_SDL),1) |
26 | CLIENT_LDFLAGS=$(shell sdl-config --libs) |
27 | @@ -1074,8 +1074,8 @@ |
28 | |
29 | $(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
30 | @echo "LD $@" |
31 | - @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
32 | - $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
33 | + @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
34 | + $(THREAD_LDFLAGS) $(LDLIBS) $(LIBSDLMAIN) |
35 | |
36 | ifneq ($(strip $(LIBSDLMAIN)),) |
37 | ifneq ($(strip $(LIBSDLMAINSRC)),) |