From 4af78734127d6325ec72f243741a24aa2447f5c4 Mon Sep 17 00:00:00 2001 From: Piotr Stefaniak Date: Sun, 9 Aug 2020 00:38:21 +0200 Subject: [PATCH] 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 (cherry picked from commit e27fbae63c3436ce5588ca06b78ea88c7a316fee) --- tools/cmake/Makefile | 1 + tools/cmake/patches/130-bootstrap_parallel_make_flag.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 33d6d4944f..66819c687d 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake PKG_VERSION:=3.15.1 +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 124cf6d9d4..cb00f1fc97 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}" -- 2.30.2