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

[Michał Górny]

commit:     65719e677340987901e07009419dea5adf475c6d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 18:38:38 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=65719e67

cmake-utils.eclass: _ninjaopts_from_makeopts, fix handling of -k

Fix _ninjaopts_from_makeopts to handle -k correctly. Make does not
support parameters to -k, while ninja requires one. Therefore, handle
only a single '-k' and convert it into '-k 0' (no limit of failing
tasks).

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5958230..d035e04 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -659,14 +659,19 @@ _ninjaopts_from_makeopts() {
        set -- ${MAKEOPTS}
        while (( $# )); do
                case $1 in
-                       -j|-l|-k)
+                       -j|-l)
                                ninjaopts+=( $1 $2 )
                                shift 2
                                ;;
-                       -j*|-l*|-k*)
+                       -j*|-l*)
                                ninjaopts+=( $1 )
                                shift 1
                                ;;
+                       -k)
+                               # -k 0 = any number of tasks can fail
+                               ninjaopts+=( $1 0 )
+                               shift 1
+                               ;;
                        *) shift ;;
                esac
        done