wok-next annotate ninja/stuff/patches/ninja-1.8.2-add_NINJAJOBS_var-1.patch @ rev 21724
busybox: update configs
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Sep 01 11:04:25 2020 +0000 (2020-09-01) |
| parents | |
| children |
| rev | line source |
|---|---|
| al@20472 | 1 Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org> |
| al@20472 | 2 Date: 2017-10-14 |
| al@20472 | 3 Initial Package Version: 1.9.2 |
| al@20472 | 4 Upstream Status: Not submitted |
| al@20472 | 5 Origin: Self |
| al@20472 | 6 Description: Ninja normally uses all cores+2 when building |
| al@20472 | 7 a package. This patch allows useers to limit the |
| al@20472 | 8 cores used by setting an environment variable: |
| al@20472 | 9 NINJAJOBS to an integer. |
| al@20472 | 10 |
| al@20472 | 11 The patch also fixes a few warnings. |
| al@20472 | 12 |
| al@20472 | 13 |
| al@20472 | 14 diff -Naur ninja-1.8.2.orig/src/build_log.cc ninja-1.8.2/src/build_log.cc |
| al@20472 | 15 --- ninja-1.8.2.orig/src/build_log.cc 2017-09-10 20:20:10.000000000 -0500 |
| al@20472 | 16 +++ ninja-1.8.2/src/build_log.cc 2017-10-12 14:38:00.988957823 -0500 |
| al@20472 | 17 @@ -75,12 +75,12 @@ |
| al@20472 | 18 } |
| al@20472 | 19 switch (len & 7) |
| al@20472 | 20 { |
| al@20472 | 21 - case 7: h ^= uint64_t(data[6]) << 48; |
| al@20472 | 22 - case 6: h ^= uint64_t(data[5]) << 40; |
| al@20472 | 23 - case 5: h ^= uint64_t(data[4]) << 32; |
| al@20472 | 24 - case 4: h ^= uint64_t(data[3]) << 24; |
| al@20472 | 25 - case 3: h ^= uint64_t(data[2]) << 16; |
| al@20472 | 26 - case 2: h ^= uint64_t(data[1]) << 8; |
| al@20472 | 27 + case 7: h ^= uint64_t(data[6]) << 48; __attribute__ ((fallthrough)); |
| al@20472 | 28 + case 6: h ^= uint64_t(data[5]) << 40; __attribute__ ((fallthrough)); |
| al@20472 | 29 + case 5: h ^= uint64_t(data[4]) << 32; __attribute__ ((fallthrough)); |
| al@20472 | 30 + case 4: h ^= uint64_t(data[3]) << 24; __attribute__ ((fallthrough)); |
| al@20472 | 31 + case 3: h ^= uint64_t(data[2]) << 16; __attribute__ ((fallthrough)); |
| al@20472 | 32 + case 2: h ^= uint64_t(data[1]) << 8; __attribute__ ((fallthrough)); |
| al@20472 | 33 case 1: h ^= uint64_t(data[0]); |
| al@20472 | 34 h *= m; |
| al@20472 | 35 }; |
| al@20472 | 36 diff -Naur ninja-1.8.2.orig/src/hash_map.h ninja-1.8.2/src/hash_map.h |
| al@20472 | 37 --- ninja-1.8.2.orig/src/hash_map.h 2017-09-10 20:20:10.000000000 -0500 |
| al@20472 | 38 +++ ninja-1.8.2/src/hash_map.h 2017-10-12 14:30:29.563974429 -0500 |
| al@20472 | 39 @@ -39,8 +39,8 @@ |
| al@20472 | 40 len -= 4; |
| al@20472 | 41 } |
| al@20472 | 42 switch (len) { |
| al@20472 | 43 - case 3: h ^= data[2] << 16; |
| al@20472 | 44 - case 2: h ^= data[1] << 8; |
| al@20472 | 45 + case 3: h ^= data[2] << 16; __attribute__ ((fallthrough)); |
| al@20472 | 46 + case 2: h ^= data[1] << 8; __attribute__ ((fallthrough)); |
| al@20472 | 47 case 1: h ^= data[0]; |
| al@20472 | 48 h *= m; |
| al@20472 | 49 }; |
| al@20472 | 50 diff -Naur ninja-1.8.2.orig/src/ninja.cc ninja-1.8.2/src/ninja.cc |
| al@20472 | 51 --- ninja-1.8.2.orig/src/ninja.cc 2017-09-10 20:20:10.000000000 -0500 |
| al@20472 | 52 +++ ninja-1.8.2/src/ninja.cc 2017-10-12 14:47:34.143936739 -0500 |
| al@20472 | 53 @@ -221,6 +221,12 @@ |
| al@20472 | 54 |
| al@20472 | 55 /// Choose a default value for the -j (parallelism) flag. |
| al@20472 | 56 int GuessParallelism() { |
| al@20472 | 57 + |
| al@20472 | 58 + int j = 0; |
| al@20472 | 59 + char* jobs = getenv( "NINJAJOBS" ); |
| al@20472 | 60 + if ( jobs != NULL ) j = atoi( jobs ); |
| al@20472 | 61 + if ( j > 0 ) return j; |
| al@20472 | 62 + |
| al@20472 | 63 switch (int processors = GetProcessorCount()) { |
| al@20472 | 64 case 0: |
| al@20472 | 65 case 1: |