diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-18 09:11:25 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-18 09:11:25 +0000 |
| commit | ddfb6389a259cfce052aa17396fecc571438598c (patch) | |
| tree | 1d2fe35bf9c2dbf60ff8a09ed3d5e1dd45e99c99 /games-action | |
| parent | Updated to new version for new gpsd, mapnik, and boost support. (diff) | |
| download | gentoo-2-ddfb6389a259cfce052aa17396fecc571438598c.tar.gz gentoo-2-ddfb6389a259cfce052aa17396fecc571438598c.tar.bz2 gentoo-2-ddfb6389a259cfce052aa17396fecc571438598c.zip | |
Respect LDFLAGS. Bug #341529
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/cylindrix/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/cylindrix/cylindrix-1.0.ebuild | 20 | ||||
| -rw-r--r-- | games-action/cylindrix/files/cylindrix-1.0-ldflags.patch | 20 |
3 files changed, 34 insertions, 14 deletions
diff --git a/games-action/cylindrix/ChangeLog b/games-action/cylindrix/ChangeLog index 18d09d422532..998cbe969cbc 100644 --- a/games-action/cylindrix/ChangeLog +++ b/games-action/cylindrix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/cylindrix -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/ChangeLog,v 1.6 2008/04/08 00:15:28 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/ChangeLog,v 1.7 2010/10/18 09:11:25 tupone Exp $ + + 18 Oct 2010; Tupone Alfredo <tupone@gentoo.org> cylindrix-1.0.ebuild, + +files/cylindrix-1.0-ldflags.patch: + Respect LDFLAGS. Bug #341529 by flameeyes@gentoo.org 08 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org> cylindrix-1.0.ebuild: link fix (bug #216632) diff --git a/games-action/cylindrix/cylindrix-1.0.ebuild b/games-action/cylindrix/cylindrix-1.0.ebuild index 44b0f45add12..e4ade48b6b37 100644 --- a/games-action/cylindrix/cylindrix-1.0.ebuild +++ b/games-action/cylindrix/cylindrix-1.0.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/cylindrix-1.0.ebuild,v 1.6 2008/04/08 00:15:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/cylindrix-1.0.ebuild,v 1.7 2010/10/18 09:11:25 tupone Exp $ +EAPI=2 inherit autotools games @@ -13,26 +14,21 @@ SLOT="0" KEYWORDS="~ppc x86" IUSE="" -DEPEND=">=media-libs/allegro-4.0.3" +RDEPEND=">=media-libs/allegro-4.0.3" +DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags.patch sed -i \ -e "/g_DataPath/s:\./:${GAMES_DATADIR}/${PN}/:" \ sb_stub.c \ || die "sed failed" - find -name CVS -exec rm -rf '{}' \; >& /dev/null + ecvs_clean eautoreconf } -src_compile() { - egamesconf || die - emake LDADD="$(allegro-config --libs)" || die "emake failed" -} - src_install() { emake DESTDIR="${D}" install || die "emake failed" insinto "${GAMES_DATADIR}"/${PN} diff --git a/games-action/cylindrix/files/cylindrix-1.0-ldflags.patch b/games-action/cylindrix/files/cylindrix-1.0-ldflags.patch new file mode 100644 index 000000000000..469026a415d1 --- /dev/null +++ b/games-action/cylindrix/files/cylindrix-1.0-ldflags.patch @@ -0,0 +1,20 @@ +--- Makefile.am.old 2010-10-18 10:28:31.000000000 +0200 ++++ Makefile.am 2010-10-18 10:29:12.000000000 +0200 +@@ -1,9 +1,4 @@ + cylindrix_CXXFLAGS = -Wall +-cylindrix_LDFLAGS = `allegro-config --libs` +- +-CXXFLAGS = $(cylindrix_CXXFLAGS) +-LDFLAGS = $(cylindrix_LDFLAGS) +- + + bin_PROGRAMS = cylindrix + +--- configure.in.old 2010-10-18 10:56:50.000000000 +0200 ++++ configure.in 2010-10-18 10:57:32.000000000 +0200 +@@ -37,4 +37,5 @@ + AC_DEFINE(__MSWINDOWS__,1,0) + fi + ++LIBS=$(allegro-config --libs) + AC_OUTPUT(Makefile) |