mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
b078229412
Update cmake to 3.12.0 Remove 140-curl-fix-libressl.patch as fix is in upstream Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
15 lines
609 B
Diff
15 lines
609 B
Diff
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1163,7 +1163,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
|