diff options
author | 2010-10-14 10:15:09 +0000 | |
---|---|---|
committer | 2010-10-14 10:15:09 +0000 | |
commit | 29a2861ce846232945b622f246b31bb11c21d82d (patch) | |
tree | 4e9ba6fcb47d51f83329020fa6b64fa7fcf9d26a /games-roguelike | |
parent | Marked ~x64-solaris (diff) | |
download | historical-29a2861ce846232945b622f246b31bb11c21d82d.tar.gz historical-29a2861ce846232945b622f246b31bb11c21d82d.tar.bz2 historical-29a2861ce846232945b622f246b31bb11c21d82d.zip |
Respect LDFLAGS. Bug #335235
Package-Manager: portage-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/Manifest | 15 | ||||
-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 |
4 files changed, 41 insertions, 16 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/Manifest b/games-roguelike/wrogue/Manifest index fff2bc8610c9..fc6c9f572aed 100644 --- a/games-roguelike/wrogue/Manifest +++ b/games-roguelike/wrogue/Manifest @@ -1,14 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX wrogue-0.8.0b-ldflags.patch 677 RMD160 9f3256ed364e66425b0edc82b80380971ad3b35a SHA1 a05618b11d1167d7948bd8ac09360a7ea6f10552 SHA256 02c10f8a6cd26d210375a82e08ab1b25696b31437915e10a1c0037b4741223a2 DIST wrogue-0.8.0b.zip 433553 RMD160 a52d94d1ec2375fcbf404eac3ceb75c271d1f31e SHA1 3dea3de3932926c70d9722753c7934b8668eeeff SHA256 adc79ec9a97b6b60a8b16b6fd548cf349606702e3df74f819537b01d6640483a -EBUILD wrogue-0.8.0b.ebuild 1196 RMD160 7b6c7ff233c8330bf3271b5dae0301670552ffe8 SHA1 f1553fdd49b02792357682fbf8cab1f0ca848c95 SHA256 a6aa05f57f8307efa888aaa5d29c1940cefad3e2882182fd585b9a2cff3be920 -MISC ChangeLog 731 RMD160 465be6753e9fb3fa2e3d6442fc58beecad457eed SHA1 b8390a420d3d2a17485cb78a9bde2e90e7f86327 SHA256 1dfcd6ab07179c9600373a05f591622f913851995dee2af26f14fb799b94e106 +EBUILD wrogue-0.8.0b.ebuild 1237 RMD160 09ffbbcd4f948b74a86283deefa43ef071d70773 SHA1 667234da4021ace929cd396d63ecf92ad6d9e08e SHA256 2d3566ca90e5519a7ca0c4e68c2d0f7300efe86154e21bd22d2d2356a8512759 +MISC ChangeLog 897 RMD160 ce14e9ec5db3d0d84a533d008d01757cc7b09dc5 SHA1 d14a37e0a15e76863fecc7c6c3ab54853e061f86 SHA256 12e326345262d93edd751c80799be10d75998e33b7e4d40c9d77d7ec9cf5996f MISC metadata.xml 339 RMD160 b730fbc271a6a9ea51b001b0c15bfed1650745b1 SHA1 f16b979d99f0ffb47f3d2a2effc6a8f601b63c79 SHA256 a3f3dd4aaca302071afbd02f1a7905a883e2bb7aed4d1c96b0a23f31410f9810 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkspT6wACgkQkKaRLQcq0GJfpACgipaWl+S6ki5+LmtrvCmoOl+B -Sd4An15r2wIqyQTFHuw5b7g0dIgLJgZw -=aiHS ------END PGP SIGNATURE----- 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() { |