From: Piotr Stefaniak Date: Sat, 8 Aug 2020 22:38:21 +0000 (+0200) Subject: tools/cmake: fix typo in parallel make patch X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e27fbae63c3436ce5588ca06b78ea88c7a316fee;p=openwrt%2Fstaging%2Frmilecki.git 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 [add commit message, add PKG_RELEASE, fix commit title, add Fixes:] Signed-off-by: Adrian Schmutzler --- diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index ab3d225aa6c..fd066da3264 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake PKG_VERSION:=3.17.0 +PKG_RELEASE:=2 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 7b6198b14b1..45ad8859534 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -5,7 +5,7 @@ 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 ++ case "$cmake_parallel_make" in + [0-9]*) cmake_parallel_make="-j ${cmake_parallel_make}";; + esac + cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}"