From: Michael Pratt Date: Thu, 30 Jun 2022 03:48:47 +0000 (-0400) Subject: tools/cmake: fix download url with make variables X-Git-Tag: v23.05.0-rc1~2374 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1e726ba015ce729cfe84e68e7924ed2258901cab;p=openwrt%2Fstaging%2Fpepe2k.git tools/cmake: fix download url with make variables Use a make variable pattern for the url so that only one version number needs to be changed when version is bumped. Signed-off-by: Michael Pratt --- diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 9650755ba0..a0695c7d62 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake PKG_VERSION:=3.24.1 +PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ - https://cmake.org/files/v3.24/ + https://cmake.org/files/v$(PKG_VERSION_MAJOR)/ PKG_HASH:=4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b HOST_BUILD_PARALLEL:=1