diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2018-04-04 10:02:32 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-04-11 21:02:29 +0200 |
| commit | a8c315192b750453e1b821ab735bdabca43a4d0e (patch) | |
| tree | 652c014e0bdc95c00f12a3803267a4f9802c36d1 /tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | |
| parent | f6e6eadc99c6274207f8f2ebc739063549959a1f (diff) | |
| download | upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.gz upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.bz2 upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.zip | |
tools/cmake: Update to 3.11.0
Update cmake to 3.11.0
Remove 110-alpine_musl-compat.patch as it's integrated upstream
Rename and refresh patches
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/130-bootstrap_parallel_make_flag.patch')
| -rw-r--r-- | tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch new file mode 100644 index 0000000000..de5137ee38 --- /dev/null +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -0,0 +1,14 @@ +--- a/bootstrap ++++ b/bootstrap +@@ -1149,7 +1149,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 |