summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2013-08-18 12:25:43 +0000
committerAlfredo Tupone <tupone@gentoo.org>2013-08-18 12:25:43 +0000
commitc2c857559d2c493652e78199644cb8e787b85f62 (patch)
tree01376a32a11d482c04a05a30694271a105e2974e /games-fps/tremulous
parentStable for amd64, wrt bug #449624 (diff)
downloadgentoo-2-c2c857559d2c493652e78199644cb8e787b85f62.tar.gz
gentoo-2-c2c857559d2c493652e78199644cb8e787b85f62.tar.bz2
gentoo-2-c2c857559d2c493652e78199644cb8e787b85f62.zip
Should fix underlink. Bug #481444
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-fps/tremulous')
-rw-r--r--games-fps/tremulous/ChangeLog6
-rw-r--r--games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch9
2 files changed, 13 insertions, 2 deletions
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index 1af51bd8c5af..729196f27c1c 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/tremulous
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.25 2013/02/07 22:07:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.26 2013/08/18 12:25:43 tupone Exp $
+
+ 18 Aug 2013; Alfredo Tupone <tupone@gentoo.org>
+ files/tremulous-1.1.0-ldflags.patch:
+ Should fix underlink. Bug #481444 by Torsten Kaiser
07 Feb 2013; Ulrich Müller <ulm@gentoo.org> tremulous-1.1.0-r4.ebuild:
Move Creative Commons licenses to shorter names.
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
index 3a3582a9aef4..4c728fc7c5fc 100644
--- a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
+++ b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
@@ -9,7 +9,14 @@
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1074,8 +1074,8 @@
+@@ -1069,13 +1069,13 @@
+
+ $(B)/tremulous.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
+ @echo "LD $@"
+- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+- $(LDFLAGS) $(LIBSDLMAIN)
++ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
++ $(LDLIBS) $(LIBSDLMAIN)
$(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
@echo "LD $@"