diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-23 11:41:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-23 11:41:17 +0000 |
| commit | 811ca6e2ac239188bd707d0c7265f6df762d86b9 (patch) | |
| tree | 74db2a8f0ec569715e531925a6950c7c05196fc6 /games-arcade/rocksndiamonds | |
| parent | Stable on ppc wrt bug 147500 (diff) | |
| download | gentoo-2-811ca6e2ac239188bd707d0c7265f6df762d86b9.tar.gz gentoo-2-811ca6e2ac239188bd707d0c7265f6df762d86b9.tar.bz2 gentoo-2-811ca6e2ac239188bd707d0c7265f6df762d86b9.zip | |
Fix parallel build #126080 by Stefaan De Roeck.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'games-arcade/rocksndiamonds')
3 files changed, 25 insertions, 5 deletions
diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog index c2d8f8bf7bd9..b4718c1bca03 100644 --- a/games-arcade/rocksndiamonds/ChangeLog +++ b/games-arcade/rocksndiamonds/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-arcade/rocksndiamonds -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.22 2006/09/23 07:46:20 mr_bones_ Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.23 2006/09/23 11:41:17 vapier Exp $ + + 23 Sep 2006; Mike Frysinger <vapier@gentoo.org> + +files/rocksndiamonds-3.2.2-parallel-build.patch, + rocksndiamonds-3.2.2.ebuild: + Fix parallel build #126080 by Stefaan De Roeck. 23 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org> rocksndiamonds-3.2.2.ebuild: diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.2-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.2-parallel-build.patch new file mode 100644 index 000000000000..8e3a565c7d36 --- /dev/null +++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.2-parallel-build.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/126080 + +--- src/Makefile ++++ src/Makefile +@@ -220,7 +220,7 @@ + # build targets + # ----------------------------------------------------------------------------- + +-all: libgame_dir game_em_dir $(PROGNAME) ++all: $(PROGNAME) + + $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON) + $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME) diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild index 39ad0d10e073..a01dc254da85 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild,v 1.2 2006/09/23 07:46:20 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.2.2.ebuild,v 1.3 2006/09/23 11:41:17 vapier Exp $ inherit flag-o-matic eutils games @@ -26,10 +26,12 @@ IUSE="X sdl" DEPEND="app-arch/unzip X? ( x11-libs/libX11 ) !sdl? ( x11-libs/libX11 ) - sdl? ( >=media-libs/libsdl-1.2.3 + sdl? ( + >=media-libs/libsdl-1.2.3 >=media-libs/sdl-mixer-1.2.4 media-libs/sdl-net - >=media-libs/sdl-image-1.2.2 )" + >=media-libs/sdl-image-1.2.2 + )" src_unpack() { unpack ${P}.tar.gz |