From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 28 Feb 2016 18:38:38 +0000 (+0100)
Subject: cmake-utils.eclass: _ninjaopts_from_makeopts, fix handling of -k
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=65719e677340987901e07009419dea5adf475c6d;p=gentoo.git

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).
---

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5958230e4685..d035e0459f23 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