diff options
| author |   Nathan Phillip Brink <binki@gentoo.org> | 2011-12-30 22:42:37 +0000 |
|---|---|---|
| committer | Nathan Phillip Brink <binki@gentoo.org> | 2011-12-30 22:42:37 +0000 |
| commit | 1f1a6d2fcd1952ed7f07dfdaaa2ecf97fa6f0272 (patch) | |
| tree | 46eb7e2e76cad04a4065a1f92728198a1636ca57 /net-irc/atheme-services | |
| parent | Fix crash bug 396377 (diff) | |
| download | gentoo-2-1f1a6d2fcd1952ed7f07dfdaaa2ecf97fa6f0272.tar.gz gentoo-2-1f1a6d2fcd1952ed7f07dfdaaa2ecf97fa6f0272.tar.bz2 gentoo-2-1f1a6d2fcd1952ed7f07dfdaaa2ecf97fa6f0272.zip | |
Fix ./configure failure of atheme-services-7.0.0_alpha9 caused by missing PKG_PROG_PKG_CONFIG call.
(Portage version: 2.2.0_alpha82-r1/cvs/Linux x86_64)
Diffstat (limited to 'net-irc/atheme-services')
3 files changed, 32 insertions, 3 deletions
diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog index f248eb821b35..d7c6d3c64b31 100644 --- a/net-irc/atheme-services/ChangeLog +++ b/net-irc/atheme-services/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/atheme-services # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.23 2011/12/26 14:42:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.24 2011/12/30 22:42:37 binki Exp $ + + 30 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> + atheme-services-7.0.0_alpha9.ebuild, + +files/atheme-services-7.0.0_alpha9-pkg-config.patch: + Fix ./configure failure of atheme-services-7.0.0_alpha9 caused by missing + PKG_PROG_PKG_CONFIG call. 26 Dec 2011; Markus Meier <maekke@gentoo.org> atheme-services-6.0.9.ebuild: x86 stable, bug #394385 diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild index 1847421a0cc7..f23574fa712c 100644 --- a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild +++ b/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild,v 1.1 2011/11/08 02:47:43 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild,v 1.2 2011/12/30 22:42:37 binki Exp $ EAPI=4 -inherit flag-o-matic perl-module +inherit autotools eutils flag-o-matic perl-module MY_P=${P/_/-} @@ -45,6 +45,11 @@ pkg_setup() { } src_prepare() { + # The first PKG_CHECK_MODULES call is conditional, causing + # PKG_PROG_PKG_CONFIG expansion to fail. + epatch "${FILESDIR}"/${P}-pkg-config.patch + eautoconf + # fix docdir sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch new file mode 100644 index 000000000000..5a81d332607e --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch @@ -0,0 +1,18 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Subject: Fix missing call to PKG_PROG_PKG_CONFIG caused by conditional + invokation of the first PKG_CHECK_MODULES call. + +--- a/configure.ac ++++ b/configure.ac +@@ -561,6 +561,10 @@ + [], + [with_mowgli2=no]) + ++dnl If the first PKG_CHECK_MODULES invokation is conditional, we must ++dnl manually invoke PKG_PROG_PKG_CONFIG: ++PKG_PROG_PKG_CONFIG ++ + if test "x$with_mowgli2" = "xyes"; then + PKG_CHECK_MODULES(MOWGLI, [libmowgli-2 >= 0.9.90], + [MOWGLI_SOURCE="system"], [ + |