diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2010-10-14 10:15:09 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-14 10:15:09 +0000 |
commit | 5f6595c4f54f368764e466eb1d509be604ba6834 (patch) | |
tree | d400a2ecf8cc92fec367e0b6640a6e9cc43b8545 /games-roguelike | |
parent | Marked ~x64-solaris (diff) | |
download | gentoo-2-5f6595c4f54f368764e466eb1d509be604ba6834.tar.gz gentoo-2-5f6595c4f54f368764e466eb1d509be604ba6834.tar.bz2 gentoo-2-5f6595c4f54f368764e466eb1d509be604ba6834.zip |
Respect LDFLAGS. Bug #335235
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-roguelike')
-rw-r--r-- | games-roguelike/wrogue/ChangeLog | 8 | ||||
-rw-r--r-- | games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch | 29 | ||||
-rw-r--r-- | games-roguelike/wrogue/wrogue-0.8.0b.ebuild | 5 |
3 files changed, 38 insertions, 4 deletions
diff --git a/games-roguelike/wrogue/ChangeLog b/games-roguelike/wrogue/ChangeLog index 450843fcc19a..4c4813aff441 100644 --- a/games-roguelike/wrogue/ChangeLog +++ b/games-roguelike/wrogue/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/wrogue -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/wrogue/ChangeLog,v 1.4 2009/12/16 21:22:52 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/wrogue/ChangeLog,v 1.5 2010/10/14 10:15:09 tupone Exp $ + + 14 Oct 2010; Tupone Alfredo <tupone@gentoo.org> wrogue-0.8.0b.ebuild, + +files/wrogue-0.8.0b-ldflags.patch: + Respect LDFLAGS. Bug #335235 by flameeyes@gentoo.org 16 Dec 2009; Markus Meier <maekke@gentoo.org> wrogue-0.8.0b.ebuild: amd64/x86 stable, bug #296457 diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch new file mode 100644 index 000000000000..3341965e5184 --- /dev/null +++ b/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch @@ -0,0 +1,29 @@ +--- src/linux.mak.old 2010-10-14 11:07:22.000000000 +0200 ++++ src/linux.mak 2010-10-14 11:08:00.000000000 +0200 +@@ -19,7 +19,7 @@ + # common compiler/linker flags
+ #
+ CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`
+-LDFLAGS=-lm `sdl-config --libs`
++LDLIBS=-lm `sdl-config --libs`
+
+
+ SRC=\
+@@ -40,7 +40,7 @@ + #
+ .PHONY: release
+ release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686
+-release: LDFLAGS += -Wl,-O1
++release: LDLIBS += -Wl,-O1
+ release: STRIP_BINARY = yes
+ release: build
+
+@@ -94,7 +94,7 @@ + @$(CC) $(CFLAGS) -o $@ -c $<
+
+ $(EXE): $(OBJ)
+- @$(CC) $(OBJ) $(LDFLAGS) -o $@
++ $(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o $@
+
+
+
diff --git a/games-roguelike/wrogue/wrogue-0.8.0b.ebuild b/games-roguelike/wrogue/wrogue-0.8.0b.ebuild index 4f2069001abb..df56ca64777e 100644 --- a/games-roguelike/wrogue/wrogue-0.8.0b.ebuild +++ b/games-roguelike/wrogue/wrogue-0.8.0b.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/wrogue/wrogue-0.8.0b.ebuild,v 1.2 2009/12/16 21:22:52 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/wrogue/wrogue-0.8.0b.ebuild,v 1.3 2010/10/14 10:15:09 tupone Exp $ EAPI=2 inherit eutils games @@ -23,6 +23,7 @@ src_prepare() { -e "/AppData\[0\]/ s:AppData.*:strcpy(AppData, \"${GAMES_DATADIR}/${PN}/\");:" \ src/lib/appdir.c \ || die "sed failed" + epatch "${FILESDIR}"/${P}-ldflags.patch } src_compile() { |