openwrt/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch

--- 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
cmake: restore parallel build support for bootstrap Signed-off-by: Felix Fietkau <nbd@nbd.name> 2017-01-12 13:31:40 +00:00			`--- a/bootstrap`
			`+++ b/bootstrap`
tools/cmake: update to 3.31.2 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> 2024-12-09 08:43:49 +00:00			`@@ -1514,7 +1514,10 @@ int main(){ printf("1%c", (char)0x0a); r`
cmake: restore parallel build support for bootstrap Signed-off-by: Felix Fietkau <nbd@nbd.name> 2017-01-12 13:31:40 +00:00			`' > "test.c"`
			`cmake_original_make_flags="${cmake_make_flags}"`
tools/cmake: update to 3.18.2 Update cmake to version 3.18.2. Refresh patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> 2020-08-23 14:11:11 +00:00			`if test "x${cmake_parallel_make}" != "x"; then`
cmake: restore parallel build support for bootstrap Signed-off-by: Felix Fietkau <nbd@nbd.name> 2017-01-12 13:31:40 +00:00			`- cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}"`
tools/cmake: fix typo in parallel make patch 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: d6de31310cc1 ("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> 2020-08-08 22:38:21 +00:00			`+ case "$cmake_parallel_make" in`
cmake: restore parallel build support for bootstrap Signed-off-by: Felix Fietkau <nbd@nbd.name> 2017-01-12 13:31:40 +00:00			`+ [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`
tools/cmake: update to 3.18.2 Update cmake to version 3.18.2. Refresh patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> 2020-08-23 14:11:11 +00:00			`if test -z "${cmake_make_processor}" && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then`