diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-02-09 22:41:16 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-02-09 22:41:16 +0000 |
| commit | d43431c80157c2aeb27476e86118b4d0e8a18a7e (patch) | |
| tree | ce503ffdfd730a2ff7fe4711496a7808d1bf5cd5 /eclass | |
| parent | added xpm to DEPEND (diff) | |
| download | gentoo-2-d43431c80157c2aeb27476e86118b4d0e8a18a7e.tar.gz gentoo-2-d43431c80157c2aeb27476e86118b4d0e8a18a7e.tar.bz2 gentoo-2-d43431c80157c2aeb27476e86118b4d0e8a18a7e.zip | |
bug #14970
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 9994b1d185ef..259d83aabfcd 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.16 2003/02/03 14:10:37 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.17 2003/02/09 22:41:16 azarah Exp $ # This eclass is for general purpose functions that most ebuilds # have to implement themselves. # @@ -330,11 +330,11 @@ get_number_of_jobs() { if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ] then ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`" - ADMINPARAM="${ADMINOPTS##*-j}" - ADMINPARAM="${ADMINPARAM%% -*}" + ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`" + ADMINPARAM="${ADMINPARAM/-j}" fi - export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j[0-9]*::g'`" + export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" ] then |