tools/cmake: fix parallel build with Make 4.2+

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

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index 7ffcc1b1d25e4f185072fd48ef0b87aa335cccf8..aaa3b33f4f3912a20be6237a54a31a2aea5f1049 100644 (file)
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 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,17 +7,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=2.8.7
+PKG_VERSION:=3.5.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/
-PKG_MD5SUM:=e1b237aeaed880f65dec9c20602452f6
+PKG_SOURCE_URL:=https://cmake.org/files/v3.5/ \
+               https://fossies.org/linux/misc/
+PKG_MD5SUM:=701386a1b5ec95f8d1075ecf96383e02
 
 HOST_BUILD_PARALLEL:=1
+HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CONFIGURE_ARGS += \
-       $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
+
+HOST_CONFIGURE_VARS :=
+
+HOST_CONFIGURE_ARGS := \
+       --prefix=$(STAGING_DIR_HOST)
 
 $(eval $(call HostBuild))