diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 04:20:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 04:20:39 +0000 |
| commit | 72af5e5314e1a1278d23eb0c55150d2696bb58ed (patch) | |
| tree | 1634b60a13a7a14a16f7a03e5c6e3d1be30eb8f8 /games-rpg/xu4 | |
| parent | remove duplicate from VIDEO_CARDS (diff) | |
| download | gentoo-2-72af5e5314e1a1278d23eb0c55150d2696bb58ed.tar.gz gentoo-2-72af5e5314e1a1278d23eb0c55150d2696bb58ed.tar.bz2 gentoo-2-72af5e5314e1a1278d23eb0c55150d2696bb58ed.zip | |
Respect LDFLAGS. Bug #337774
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-rpg/xu4')
| -rw-r--r-- | games-rpg/xu4/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/xu4/files/xu4-0.9-ldflags.patch | 35 | ||||
| -rw-r--r-- | games-rpg/xu4/xu4-0.9.ebuild | 5 |
3 files changed, 43 insertions, 3 deletions
diff --git a/games-rpg/xu4/ChangeLog b/games-rpg/xu4/ChangeLog index 075ce4745a09..b49b9a5cb590 100644 --- a/games-rpg/xu4/ChangeLog +++ b/games-rpg/xu4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/xu4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.7 2010/09/13 05:14:29 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.8 2010/09/30 04:20:39 tupone Exp $ + + 30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> xu4-0.9.ebuild, + +files/xu4-0.9-ldflags.patch: + Respect LDFLAGS. Bug #337774 by flameeyes@gentoo.org 13 Sep 2010; Joseph Jezak <josejx@gentoo.org> xu4-0.9.ebuild: Marked ppc stable for bug #334201. diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch new file mode 100644 index 000000000000..c41600ad5148 --- /dev/null +++ b/games-rpg/xu4/files/xu4-0.9-ldflags.patch @@ -0,0 +1,35 @@ +--- src/Makefile.common.old 2010-09-30 06:12:23.000000000 +0200 ++++ src/Makefile.common 2010-09-30 06:15:22.000000000 +0200 +@@ -68,25 +68,25 @@ + mkutils:: dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT) + + $(MAIN): $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + + dumpsavegame$(EXEEXT) : util/dumpsavegame.o savegame.o io.o names.o +- $(CC) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o ++ $(CC) $(LDFLAGS) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o + + lzwenc$(EXEEXT) : util/lzwenc.o lzw/hash.o util/pngconv.o +- $(CC) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz + + lzwdec$(EXEEXT) : util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o +- $(CC) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz + + rleenc$(EXEEXT) : util/rleenc.o util/pngconv.o +- $(CC) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz + + rledec$(EXEEXT) : util/rledec.o rle.o util/pngconv.o +- $(CC) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz ++ $(CC) $(LDFLAGS) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz + + tlkconv$(EXEEXT) : util/tlkconv.o +- $(CC) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs) + + clean:: cleanutil + rm -rf *~ */*~ $(OBJS) $(MAIN) diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild index 0c561593f649..2333c0acd2c7 100644 --- a/games-rpg/xu4/xu4-0.9.ebuild +++ b/games-rpg/xu4/xu4-0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.10 2010/09/13 05:14:29 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.11 2010/09/30 04:20:39 tupone Exp $ EAPI=2 inherit eutils games @@ -38,7 +38,8 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/${PV}-savegame.patch" + epatch "${FILESDIR}/${PV}-savegame.patch" \ + "${FILESDIR}"/${P}-ldflags.patch sed -i \ -e "s:/usr/local/lib/u4:$(games_get_libdir)/u4:" src/u4file.c \ || die "sed u4file failed" |