mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
4af7873412
The variable in the case argument was mistyped, so the case always checked against an empty string and never matched. Fix the variable name. Add a PKG_RELEASE to Makefile so we can bump it. Fixes:d6de31310c("cmake: restore parallel build support for bootstrap") Signed-off-by: Piotr Stefaniak <pstef@freebsd.org> [add commit message, add PKG_RELEASE, fix commit title, add Fixes:] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commite27fbae63c)
15 lines
610 B
Diff
15 lines
610 B
Diff
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1168,7 +1168,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_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 [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then
|