diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-08-23 17:11:11 +0300 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2020-08-23 19:40:42 +0200 |
commit | 84834df9b9867b37b1ac6ade8abcf17cda456974 (patch) | |
tree | e0833c77fa8c9d1e73dd35bc5fc22dfbb0729c5f /tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | |
parent | 4faf7704a2426c1b93262473d547e38fa067c356 (diff) | |
download | upstream-84834df9b9867b37b1ac6ade8abcf17cda456974.tar.gz upstream-84834df9b9867b37b1ac6ade8abcf17cda456974.tar.bz2 upstream-84834df9b9867b37b1ac6ade8abcf17cda456974.zip |
tools/cmake: update to 3.18.2
Update cmake to version 3.18.2.
Refresh patches.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools/cmake/patches/130-bootstrap_parallel_make_flag.patch')
-rw-r--r-- | tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 45ad885953..4d5ed266c4 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,9 +1,9 @@ --- a/bootstrap +++ b/bootstrap -@@ -1283,7 +1283,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1296,7 +1296,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 + if test "x${cmake_parallel_make}" != "x"; then - cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}" + case "$cmake_parallel_make" in + [0-9]*) cmake_parallel_make="-j ${cmake_parallel_make}";; @@ -11,4 +11,4 @@ + 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 + if test -z "${cmake_make_processor}" && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then |