cmake: restore parallel build support for bootstrap

[openwrt/openwrt.git] / tools / cmake / Makefile

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index fab2be6fa15a22cd4fd16c1a04e720a045628223..c56cd40fb5a92b5240cacd0138b89d51ff6f65c6 100644 (file)
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,22 +7,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.4.0
+PKG_VERSION:=3.7.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.cmake.org/files/v3.4/ \
+PKG_SOURCE_URL:=https://cmake.org/files/v3.7/ \
                https://fossies.org/linux/misc/
-PKG_MD5SUM:=cd3034e0a44256a0917e254167217fc8
+PKG_HASH:=449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CONFIGURE_CMD := \
+       MAKEFLAGS="$(HOST_JOBS)" \
+       $(BASH) ./configure \
+               $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+
 HOST_CONFIGURE_VARS :=
 
 HOST_CONFIGURE_ARGS := \
-       --prefix=$(STAGING_DIR_HOST) \
-       $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+       --prefix=$(STAGING_DIR_HOST)
 
 $(eval $(call HostBuild))