mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
4234d5ec45
Release notes: https://cmake.org/cmake/help/latest/release/3.31.html Refresh patches: - 120-curl-fix-libressl-linking.patch - 130-bootstrap_parallel_make_flag.patch - 150-zstd-libarchive.patch - 160-disable_xcode_generator.patch Signed-off-by: Jack Sun <sunjiazheng321521@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17056 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
15 lines
612 B
Diff
15 lines
612 B
Diff
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1514,7 +1514,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
|