diff options
author | Mark Wright <gienah@gentoo.org> | 2014-03-05 03:11:15 +0000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2014-03-05 03:11:15 +0000 |
commit | b803a50e48c90a90004f6833354aefef509c802b (patch) | |
tree | 556dac2cf833e9ebcb078fa94a8b0f8696d07d40 /net-irc | |
parent | version bump (diff) | |
download | gentoo-2-b803a50e48c90a90004f6833354aefef509c802b.tar.gz gentoo-2-b803a50e48c90a90004f6833354aefef509c802b.tar.bz2 gentoo-2-b803a50e48c90a90004f6833354aefef509c802b.zip |
Thanks for jer for reporting in bug 453396 that "And now cross-compiling might fail because you use pkg-config directly." - correct this by using a sed to in src_prepare to change pkg-config to $(tc-getPKG_CONFIG). Add "-Wl,--as-needed" to LDFLAGS, thanks to jer in comment 23 of bug 453396.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/irssi/ChangeLog | 8 | ||||
-rw-r--r-- | net-irc/irssi/irssi-0.8.15-r2.ebuild | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog index d27607d7ea5f..8d8da15ce113 100644 --- a/net-irc/irssi/ChangeLog +++ b/net-irc/irssi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/irssi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.183 2014/03/04 13:08:52 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.184 2014/03/05 03:11:15 gienah Exp $ + + 05 Mar 2014; Mark Wright <gienah@gentoo.org> irssi-0.8.15-r2.ebuild: + Thanks for jer for reporting in bug 453396 that "And now cross-compiling might + fail because you use pkg-config directly." - correct this by using a sed to in + src_prepare to change pkg-config to $(tc-getPKG_CONFIG). Add "-Wl,--as-needed" + to LDFLAGS, thanks to jer in comment 23 of bug 453396. *irssi-0.8.15-r2 (04 Mar 2014) diff --git a/net-irc/irssi/irssi-0.8.15-r2.ebuild b/net-irc/irssi/irssi-0.8.15-r2.ebuild index edd37d82a4a5..e762b0ae5c6a 100644 --- a/net-irc/irssi/irssi-0.8.15-r2.ebuild +++ b/net-irc/irssi/irssi-0.8.15-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.3 2014/03/04 13:08:52 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.4 2014/03/05 03:11:15 gienah Exp $ EAPI=4 -inherit autotools-utils perl-module +inherit autotools-utils eutils flag-o-matic perl-module toolchain-funcs # Keep for _rc compability MY_P="${P/_/-}" @@ -30,14 +30,17 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/${PN}-0.8.15-tinfo.patch" ) - src_prepare() { + epatch "${FILESDIR}/${PN}-0.8.15-tinfo.patch" + sed -e "s@pkg-config@$(tc-getPKG_CONFIG)@g" \ + -i "${S}/curses.m4" \ + || die "Could not configure pkg-config in curses.m4" AUTOTOOLS_AUTORECONF=1 autotools-utils_src_prepare } src_configure() { + $(test-flag-CC "-Wl,--as-needed") && append-ldflags "-Wl,--as-needed" econf \ --with-proxy \ --with-ncurses="${EPREFIX}"/usr \ |