hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-04 06:54:27 -05:00
Code Issues Projects Releases Wiki Activity

tools/cmake: fix typo in parallel make patch

Browse Source 
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>
This commit is contained in:
Piotr Stefaniak 2020-08-09 00:38:21 +02:00 committed by Adrian Schmutzler
parent c25c9e98f5
commit e27fbae63c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/cmake/Makefile
View File

@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=3.17.0 PKG_VERSION:=3.17.0
PKG_RELEASE:=2
PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_CPE_ID:=cpe:/a:kitware:cmake
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

2
tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
View File

@ -5,7 +5,7 @@
cmake_original_make_flags="${cmake_make_flags}" cmake_original_make_flags="${cmake_make_flags}"
if [ "x${cmake_parallel_make}" != "x" ]; then if [ "x${cmake_parallel_make}" != "x" ]; then
- cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}" - 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}";; + [0-9]*) cmake_parallel_make="-j ${cmake_parallel_make}";;
+ esac + esac
+ cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}" + cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}"