From 9f1dbd20b30eda4a045fbe86c7a36a80887630e1 Mon Sep 17 00:00:00 2001 From: jiangxiaoming Date: Thu, 27 Aug 2020 16:00:16 +0800 Subject: [PATCH] build: Fix 'make build VPP_EXTRA_CMAKE_ARGS=-DVPP_ENABLE_SANITIZE_ADDR=ON' error on Centos 7 Type: fix Signed-off-by: jiangxiaoming Change-Id: Ic47f5e8627923c951333c70004850b53ed4cab06 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index feb23e50cb8..29c4c962254 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ else RPM_DEPENDS += python36-ply # for vppapigen RPM_DEPENDS += python3-devel python3-pip RPM_DEPENDS += python-virtualenv python36-jsonschema - RPM_DEPENDS += devtoolset-9 + RPM_DEPENDS += devtoolset-9 devtoolset-9-libasan-devel RPM_DEPENDS += cmake3 RPM_DEPENDS_GROUPS = 'Development Tools' endif @@ -291,7 +291,7 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) exit 0 else ifneq ("$(wildcard /etc/redhat-release)","") @for i in $(RPM_DEPENDS) ; do \ - RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3) ; \ + RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3,4) ; \ MISSING+=$$(rpm -q $$RPM | grep "^package") ; \ done ; \ if [ -n "$$MISSING" ] ; then \ -- 2.16.6