diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 16:13:45 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 16:13:45 +0000 |
| commit | f46c8062933c4d345cf43bdcfd4dd7650483cb12 (patch) | |
| tree | 89783a1876b2599200ef49f76e69ab52724eb599 /games-arcade | |
| parent | Cleanup, improve directory structure, bug 139537, thanks to Roberto Castagnol... (diff) | |
| download | gentoo-2-f46c8062933c4d345cf43bdcfd4dd7650483cb12.tar.gz gentoo-2-f46c8062933c4d345cf43bdcfd4dd7650483cb12.tar.bz2 gentoo-2-f46c8062933c4d345cf43bdcfd4dd7650483cb12.zip | |
Respect LDFLAGS. Bug #337435
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/xtux/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/xtux/files/xtux-20030306-ldflags.patch | 22 | ||||
| -rw-r--r-- | games-arcade/xtux/xtux-20030306.ebuild | 10 |
3 files changed, 32 insertions, 6 deletions
diff --git a/games-arcade/xtux/ChangeLog b/games-arcade/xtux/ChangeLog index 8f536e3e747f..54ab51d046b3 100644 --- a/games-arcade/xtux/ChangeLog +++ b/games-arcade/xtux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/xtux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.13 2010/03/09 12:57:51 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.14 2010/09/30 16:13:45 tupone Exp $ + + 30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> xtux-20030306.ebuild, + +files/xtux-20030306-ldflags.patch: + Respect LDFLAGS. Bug #337435 by flameeyes@gentoo.org 09 Mar 2010; Jonathan Callen <abcd@gentoo.org> xtux-20030306.ebuild: QA: Do not use absolute path to icon when in standard dirs (in diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch new file mode 100644 index 000000000000..d2c798d0795d --- /dev/null +++ b/games-arcade/xtux/files/xtux-20030306-ldflags.patch @@ -0,0 +1,22 @@ +--- src/client/Makefile.old 2010-09-30 18:08:16.000000000 +0200 ++++ src/client/Makefile 2010-09-30 18:08:41.000000000 +0200 +@@ -48,7 +48,7 @@ + + #Apps + client: $(OBJECTS) +- $(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB) ++ $(CC) -o $(BINARY) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB) + + # OBJECTS + .c.o: client.h $*.c +--- src/server/Makefile.old 2010-09-30 18:09:55.000000000 +0200 ++++ src/server/Makefile 2010-09-30 18:10:16.000000000 +0200 +@@ -41,7 +41,7 @@ + + #Apps + server: $(OBJECTS) +- $(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB) ++ $(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB) + + # OBJECTS + .c.o: server.h $*.h $*.c diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306.ebuild index 7da2eb09077e..755bb2ef9614 100644 --- a/games-arcade/xtux/xtux-20030306.ebuild +++ b/games-arcade/xtux/xtux-20030306.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.16 2010/03/09 12:57:51 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.17 2010/09/30 16:13:45 tupone Exp $ +EAPI="2" inherit eutils games @@ -17,9 +18,7 @@ DEPEND="x11-libs/libXpm" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { find data/ -type d -name .xvpics -exec rm -rf \{\} + sed -i \ -e "s:-g -Wall -O2:${CFLAGS}:" \ @@ -29,7 +28,8 @@ src_unpack() { -e "s:./tux_serv:tux_serv:" \ src/client/menu.c \ || die "sed failed" - epatch "${FILESDIR}/${P}-particles.patch" + epatch "${FILESDIR}/${P}-particles.patch" \ + "${FILESDIR}"/${P}-ldflags.patch } src_compile() { |