[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     58f3cda1c95561de75be3bd441e7536ee3ce431a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 18:42:18 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 26 08:09:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f3cda1

cmake-utils.eclass: _ninjaopts_from_makeopts, fix plain '-j' and '-l'

Fix the _ninjaopts_from_makeopts to handle no-parameter '-j' and '-l'
options correctly and convert them to appropriate parametrized ninja
options.

 eclass/cmake-utils.eclass | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d035e04..02b06bb 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -660,8 +660,19 @@ _ninjaopts_from_makeopts() {
        while (( $# )); do
                case $1 in
                        -j|-l)
-                               ninjaopts+=( $1 $2 )
-                               shift 2
+                               if [[ $# -eq 1 || $2 == -* ]]; then
+                                       if [[ $1 == -j ]]; then
+                                               # absurdly high job limit
+                                               ninjaopts+=( $1 9999 )
+                                       else # -l
+                                               # remove load limit (like make 
does for -l)
+                                               ninjaopts+=( $1 0 )
+                                       fi
+                                       shift 1
+                               else
+                                       ninjaopts+=( $1 $2 )
+                                       shift 2
+                               fi
                                ;;
                        -j*|-l*)
                                ninjaopts+=( $1 )