1 |
commit: 65719e677340987901e07009419dea5adf475c6d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 28 18:38:38 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 08:09:57 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65719e67 |
7 |
|
8 |
cmake-utils.eclass: _ninjaopts_from_makeopts, fix handling of -k |
9 |
|
10 |
Fix _ninjaopts_from_makeopts to handle -k correctly. Make does not |
11 |
support parameters to -k, while ninja requires one. Therefore, handle |
12 |
only a single '-k' and convert it into '-k 0' (no limit of failing |
13 |
tasks). |
14 |
|
15 |
eclass/cmake-utils.eclass | 9 +++++++-- |
16 |
1 file changed, 7 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
19 |
index 5958230..d035e04 100644 |
20 |
--- a/eclass/cmake-utils.eclass |
21 |
+++ b/eclass/cmake-utils.eclass |
22 |
@@ -659,14 +659,19 @@ _ninjaopts_from_makeopts() { |
23 |
set -- ${MAKEOPTS} |
24 |
while (( $# )); do |
25 |
case $1 in |
26 |
- -j|-l|-k) |
27 |
+ -j|-l) |
28 |
ninjaopts+=( $1 $2 ) |
29 |
shift 2 |
30 |
;; |
31 |
- -j*|-l*|-k*) |
32 |
+ -j*|-l*) |
33 |
ninjaopts+=( $1 ) |
34 |
shift 1 |
35 |
;; |
36 |
+ -k) |
37 |
+ # -k 0 = any number of tasks can fail |
38 |
+ ninjaopts+=( $1 0 ) |
39 |
+ shift 1 |
40 |
+ ;; |
41 |
*) shift ;; |
42 |
esac |
43 |
done |