mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
4af7873412
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:d6de31310c("cmake: restore parallel build support for bootstrap") Signed-off-by: Piotr Stefaniak <pstef@freebsd.org> [add commit message, add PKG_RELEASE, fix commit title, add Fixes:] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commite27fbae63c)
51 lines
1.5 KiB
Makefile
51 lines
1.5 KiB
Makefile
#
|
|
# Copyright (C) 2006-2016 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
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
|
|
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
|
|
https://cmake.org/files/v3.15/
|
|
PKG_HASH:=18dec548d8f8b04d53c60f9cedcebaa6762f8425339d1e2c889c383d3ccdd7f7
|
|
|
|
HOST_BUILD_PARALLEL:=1
|
|
HOST_CONFIGURE_PARALLEL:=1
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
|
|
# Workaround for GCC versions below 6.X and ccache
|
|
# Reference: https://github.com/openwrt/openwrt/pull/1929
|
|
GCC_DMPVER_GREPCMD := grep -E '^(4\.[8-9]|[5]\.?)'
|
|
GCC_DMPVER_STRING := $(shell $(HOSTCC_NOCACHE) -dumpversion | $(GCC_DMPVER_GREPCMD))
|
|
ifneq ($(GCC_DMPVER_STRING),)
|
|
ifeq ($(CONFIG_CCACHE),y)
|
|
$(info GCC version less than 6.0 detected, disabling CCACHE)
|
|
HOST_CONFIGURE_VARS:=$(filter-out CC=% gcc%",$(HOST_CONFIGURE_VARS)) CC="$(HOSTCC_NOCACHE)"
|
|
HOST_CONFIGURE_VARS:=$(filter-out CXX=% g++%",$(HOST_CONFIGURE_VARS)) CXX="$(HOSTCXX_NOCACHE)"
|
|
else
|
|
$(info GCC version greater or equal to 6.0 detected, no workaround set for CCACHE)
|
|
endif
|
|
endif
|
|
|
|
HOST_CONFIGURE_VARS += \
|
|
MAKEFLAGS="$(HOST_JOBS)" \
|
|
CXXFLAGS="$(HOST_CFLAGS)"
|
|
|
|
HOST_CONFIGURE_ARGS := \
|
|
$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
|
|
--prefix=$(STAGING_DIR_HOST)
|
|
|
|
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
|
|
HOST_MAKE_FLAGS += VERBOSE=1
|
|
endif
|
|
|
|
$(eval $(call HostBuild))
|