diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-02-02 19:43:33 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-02-02 19:43:33 +0000 |
| commit | 4ca501d4b1823d7a71ac33562036a8cd830e543b (patch) | |
| tree | 92c7187a8fd6e154378f82385c2d97e1af8e345f /eclass | |
| parent | Added (diff) | |
| download | gentoo-2-4ca501d4b1823d7a71ac33562036a8cd830e543b.tar.gz gentoo-2-4ca501d4b1823d7a71ac33562036a8cd830e543b.tar.bz2 gentoo-2-4ca501d4b1823d7a71ac33562036a8cd830e543b.zip | |
fix bug #14605
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index ba66baa8ca2a..4ae617014836 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.14 2003/01/19 20:23:28 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.15 2003/02/02 19:43:33 azarah Exp $ # This eclass is for general purpose functions that most ebuilds # have to implement themselves. # @@ -381,13 +381,16 @@ get_number_of_jobs() { jobs=1 fi - if [ -n "${ADMINPARAM}" -a "${jobs}" -gt "${ADMINPARAM}" ] + if [ -n "${ADMINPARAM}" ] then - einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." - export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" - else - einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." - export MAKEOPTS="${MAKEOPTS} -j${jobs}" + if [ "${jobs}" -gt "${ADMINPARAM}" ] + then + einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." + export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" + else + einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." + export MAKEOPTS="${MAKEOPTS} -j${jobs}" + fi fi } |