diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-02-07 14:55:08 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-02-07 14:55:08 +0000 |
| commit | cdd28cdb5c74aeab28ef52f0f72cac753a8962f8 (patch) | |
| tree | 259f07e4927f25f58482e2a71aaf8c0c4cb4033d /eclass | |
| parent | x86 stable wrt bug #353571 (diff) | |
| download | gentoo-2-cdd28cdb5c74aeab28ef52f0f72cac753a8962f8.tar.gz gentoo-2-cdd28cdb5c74aeab28ef52f0f72cac753a8962f8.tar.bz2 gentoo-2-cdd28cdb5c74aeab28ef52f0f72cac753a8962f8.zip | |
Translate --jobs with no count to safer --jobs=5.
Value-less --jobs is mostly used along with --load-average, which is not supported by SCons. Thus, we should use a safe number of jobs.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/scons-utils.eclass | 6 | ||||
| -rwxr-xr-x | eclass/tests/scons-utils.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index a44b7f27ce26..eac223e3c92d 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.2 2010/10/27 18:23:58 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.3 2011/02/07 14:55:08 mgorny Exp $ # @ECLASS: scons-utils.eclass # @MAINTAINER: @@ -118,7 +118,7 @@ scons_clean_makeopts() { shift else # no value means no limit, let's pass a random int - new_makeopts=${new_makeopts+${new_makeopts} }${1}=255 + new_makeopts=${new_makeopts+${new_makeopts} }${1}=5 fi ;; # strip other long options @@ -141,7 +141,7 @@ scons_clean_makeopts() { new_optstr="${new_optstr}j ${2}" shift else - new_optstr="${new_optstr}j 255" + new_optstr="${new_optstr}j 5" fi ;; # otherwise, everything after -j is treated as an arg diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh index a45d082875dd..d4ad4b796950 100755 --- a/eclass/tests/scons-utils.sh +++ b/eclass/tests/scons-utils.sh @@ -22,7 +22,7 @@ test-scons_clean_makeopts() { } # jobcount expected for non-specified state -jc=255 +jc=5 # failed test counter failed=0 |