From: Andrew Yourtchenko Date: Wed, 27 Mar 2019 14:22:40 +0000 (+0100) Subject: cmake: fix errors in external when building past point-release X-Git-Tag: v19.04-rc1~2 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=e36f44ad923f4e64266fd3e4dee6e2716e687504;p=vpp.git cmake: fix errors in external when building past point-release Change-Id: I23b4816e4ef2c6a2fa825fbd063ea25ff2024151 Signed-off-by: Andrew Yourtchenko --- diff --git a/build/external/Makefile b/build/external/Makefile index c56e16d1f51..bc54efebd42 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -19,7 +19,7 @@ MAKE ?= make MAKE_ARGS ?= -j BUILD_DIR ?= $(CURDIR)/_build INSTALL_DIR ?= $(CURDIR)/_install -PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2) +PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2) PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l) JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\ $(shell grep -c ^processor /proc/cpuinfo), 2)