diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-10-23 20:07:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-23 20:07:18 +0000 |
| commit | a02fc2474f4bcc1871567178a3901e9e86847c11 (patch) | |
| tree | 92a432325e390af496647be8229b77a1c596fc43 /sys-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-a02fc2474f4bcc1871567178a3901e9e86847c11.tar.gz gentoo-2-a02fc2474f4bcc1871567178a3901e9e86847c11.tar.bz2 gentoo-2-a02fc2474f4bcc1871567178a3901e9e86847c11.zip | |
Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/ncurses/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-5.9-r2.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 05b7d924263c..c0d9f568e4bf 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.211 2012/07/29 16:50:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.212 2012/10/23 20:07:18 vapier Exp $ + + 23 Oct 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild: + Bypass dumb pkg-config install checks #438922 by Benjamin Peterson. 29 Jul 2012; Raúl Porcel <armin76@gentoo.org> ncurses-5.9-r2.ebuild: alpha/sparc stable wrt #413897 diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild index 82890594441e..836835da6442 100644 --- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.15 2012/07/29 16:50:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.16 2012/10/23 20:07:18 vapier Exp $ EAPI="1" inherit eutils flag-o-matic toolchain-funcs @@ -32,9 +32,6 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871 epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763 - sed -i \ - -e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \ - misc/Makefile.in || die } src_compile() { @@ -66,6 +63,12 @@ do_compile() { cd "${WORKDIR}"/$1 shift + # ncurses is dumb and doesn't install .pc files unless pkg-config + # is also installed. Force the tests to go our way. Note that it + # doesn't actually use pkg-config ... it just looks for set vars. + tc-export PKG_CONFIG + export PKG_CONFIG_LIBDIR="/usr/$(get_libdir)/pkgconfig" + # The chtype/mmask-t settings below are to retain ABI compat # with ncurses-5.4 so dont change em ! local conf_abi=" |