diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-03-21 05:11:09 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-03-21 05:11:09 +0000 |
| commit | bef9cea4e7f2a0c6247762476b63a802a547de1d (patch) | |
| tree | 32c2e203e168a11897c95353211a394882d24c3e /games-roguelike/nethack | |
| parent | revbump; Add py3 support, update deps & new PYTHON_REQ_USE setting for tests,... (diff) | |
| download | gentoo-2-bef9cea4e7f2a0c6247762476b63a802a547de1d.tar.gz gentoo-2-bef9cea4e7f2a0c6247762476b63a802a547de1d.tar.bz2 gentoo-2-bef9cea4e7f2a0c6247762476b63a802a547de1d.zip | |
Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'games-roguelike/nethack')
| -rw-r--r-- | games-roguelike/nethack/ChangeLog | 7 | ||||
| -rw-r--r-- | games-roguelike/nethack/nethack-3.4.3-r1.ebuild | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog index 926caa2d3077..6ddb7c30e7c2 100644 --- a/games-roguelike/nethack/ChangeLog +++ b/games-roguelike/nethack/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-roguelike/nethack -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.34 2010/03/02 21:10:39 mr_bones_ Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.35 2014/03/21 05:11:09 jer Exp $ + + 21 Mar 2014; Jeroen Roovers <jer@gentoo.org> nethack-3.4.3-r1.ebuild: + Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS. 02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> -files/3.4.3-QT-support.patch, nethack-3.4.3-r1.ebuild, diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild index d120ac45458a..00e0f703772b 100644 --- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild +++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.27 2010/03/02 21:10:39 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.28 2014/03/21 05:11:09 jer Exp $ EAPI=2 inherit eutils toolchain-funcs flag-o-matic games @@ -22,6 +22,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5 x11-libs/libXt )" DEPEND="${RDEPEND} + virtual/pkgconfig X? ( x11-proto/xproto x11-apps/bdftopcf @@ -65,13 +66,20 @@ src_prepare() { || die "sed Makefile failed" fi + # sys-libs/ncurses[tinfo] + sed -i \ + -e '/^WINTTYLIB/s| = .*| = '"$( + $(tc-getPKG_CONFIG) --libs ncurses + )"'|g' \ + src/Makefile || die + if use X ; then epatch "${FILESDIR}/${PV}-X-support.patch" fi } src_compile() { - local lflags="-L/usr/X11R6/lib" + local lflags="${LDFLAGS}" cd "${S}"/src append-flags -I../include @@ -88,7 +96,11 @@ src_compile() { LFLAGS="${lflags}" \ || die "main build failed" cd "${S}"/util - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" recover || die "util build failed" + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LFLAGS="${lflags}" \ + recover || die "util build failed" } src_install() { |