summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago M. Mola <coldwind@gentoo.org>2008-09-26 12:26:29 +0000
committerSantiago M. Mola <coldwind@gentoo.org>2008-09-26 12:26:29 +0000
commitfa0ecccedc07f902176e0651818efb706315bba6 (patch)
tree3f87fdedf7699b93756a3ddad8fd1830214aa250 /net-voip/telepathy-butterfly
parentMarked ~hppa (bug #237411). (diff)
downloadgentoo-2-fa0ecccedc07f902176e0651818efb706315bba6.tar.gz
gentoo-2-fa0ecccedc07f902176e0651818efb706315bba6.tar.bz2
gentoo-2-fa0ecccedc07f902176e0651818efb706315bba6.zip
Fix build when MAKEOPTS contains options different than -j, fixes #233943.
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'net-voip/telepathy-butterfly')
-rw-r--r--net-voip/telepathy-butterfly/ChangeLog6
-rw-r--r--net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 98faa445f488..9badf2bbdca1 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-voip/telepathy-butterfly
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.9 2008/08/20 22:34:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.10 2008/09/26 12:26:29 coldwind Exp $
+
+ 26 Sep 2008; Santiago M. Mola <coldwind@gentoo.org>
+ telepathy-butterfly-0.3.2.ebuild:
+ Fix build when MAKEOPTS contains options different than -j, fixes #233943.
*telepathy-butterfly-0.3.2 (20 Aug 2008)
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
index 02311ced60ee..c35fe68ccb1f 100644
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild,v 1.1 2008/08/20 22:34:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild,v 1.2 2008/09/26 12:26:29 coldwind Exp $
NEED_PYTHON="2.4"
@@ -21,9 +21,10 @@ RDEPEND="dev-python/telepathy-python
DOCS="AUTHORS NEWS"
src_compile() {
+ local myjobs=$(echo "$MAKEOPTS" | sed -n -e 's,.*\(-j[[:digit:]]\+\).*,\1,p')
./waf --prefix=/usr \
configure || die "./waf configure failed"
- ./waf ${MAKEOPTS} build || die "./waf configure failed"
+ ./waf ${myjobs} build || die "./waf configure failed"
}
src_install() {