mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
e12504a4d0
Previous commit forgot to refresh the patches.
This commit refreshes the patches:
- 120-curl-fix-libressl-linking.patch
- 130-bootstrap_parallel_make_flag.patch
Fixes: 3b2f19271c ("tools/cmake: update to 3.24.1")
Signed-off-by: Nick Hainke <vincent@systemli.org>
15 lines
612 B
Diff
15 lines
612 B
Diff
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1441,7 +1441,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
|
' > "test.c"
|
|
cmake_original_make_flags="${cmake_make_flags}"
|
|
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}";;
|
|
+ esac
|
|
+ cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}"
|
|
fi
|
|
for a in ${cmake_make_processors}; do
|
|
if test -z "${cmake_make_processor}" && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then
|