projects
/
openwrt
/
staging
/
lynxis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add CPE ids to package and tools
[openwrt/staging/lynxis.git]
/
tools
/
cmake
/
Makefile
diff --git
a/tools/cmake/Makefile
b/tools/cmake/Makefile
index 9545e12d6cc783b4994df8c8142e9aee151816c2..541febc4e3320c1849fe0848d1a1ad2c727f925a 100644
(file)
--- a/
tools/cmake/Makefile
+++ b/
tools/cmake/Makefile
@@
-7,23
+7,29
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=cmake
include $(TOPDIR)/rules.mk
PKG_NAME:=cmake
-PKG_VERSION:=3.7.1
+PKG_VERSION:=3.9.3
+PKG_CPE=cpe:/a:kitware:cmake
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://cmake.org/files/v3.
7
/ \
+PKG_SOURCE_URL:=https://cmake.org/files/v3.
9
/ \
https://fossies.org/linux/misc/
https://fossies.org/linux/misc/
-PKG_HASH:=
449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1
+PKG_HASH:=
8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a
HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
-HOST_CONFIGURE_
CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
-
-HOST_CONFIGURE_VARS :=
+HOST_CONFIGURE_
VARS += \
+ MAKEFLAGS="$(HOST_JOBS)" \
+ CXXFLAGS="$(HOST_CFLAGS)"
HOST_CONFIGURE_ARGS := \
HOST_CONFIGURE_ARGS := \
+ $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
--prefix=$(STAGING_DIR_HOST)
--prefix=$(STAGING_DIR_HOST)
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+ HOST_MAKE_FLAGS += VERBOSE=1
+endif
+
$(eval $(call HostBuild))
$(eval $(call HostBuild))