diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2017-09-30 11:00:32 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-30 22:41:12 +0200 |
| commit | 839129b86453f0b0b2b47dac5502ecc3dae7ffb3 (patch) | |
| tree | 390fb5c911ec87150081eacd08098a3a01ec5f4f /tools/cmake/patches/140-bootstrap_parallel_make_flag.patch | |
| parent | 3adafda07c8509267e3321f4861f620ec3b2f37e (diff) | |
| download | upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.gz upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.bz2 upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.zip | |
tools/cmake: Update to 3.9.3
Update CMake to 3.9.3
Remove FreeBSD patch (not needed)
Rearrage and update patches
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/140-bootstrap_parallel_make_flag.patch')
| -rw-r--r-- | tools/cmake/patches/140-bootstrap_parallel_make_flag.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch new file mode 100644 index 0000000000..734e8cb1cc --- /dev/null +++ b/tools/cmake/patches/140-bootstrap_parallel_make_flag.patch @@ -0,0 +1,14 @@ +--- a/bootstrap ++++ b/bootstrap +@@ -1094,7 +1094,10 @@ int main(){ printf("1%c", (char)0x0a); r + ' > "test.c" + cmake_original_make_flags="${cmake_make_flags}" + if [ "x${cmake_parallel_make}" != "x" ]; then +- cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}" ++ case "$cmake_paralle_make" in ++ [0-9]*) cmake_parallel_make="-j ${cmake_parallel_make}";; ++ esac ++ cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}" + fi + for a in ${cmake_make_processors}; do + if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then |