aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorjiangxiaoming <jiangxiaoming@outlook.com>2020-08-27 16:00:16 +0800
committerBenoƮt Ganne <bganne@cisco.com>2020-09-02 10:02:50 +0000
commit9f1dbd20b30eda4a045fbe86c7a36a80887630e1 (patch)
tree7746c285cd664f3afa223a3be9a5d4447419f516 /Makefile
parent50bd16559933576ed632eff8757d5954e93e99ce (diff)
build: Fix 'make build VPP_EXTRA_CMAKE_ARGS=-DVPP_ENABLE_SANITIZE_ADDR=ON' error on Centos 7
Type: fix Signed-off-by: jiangxiaoming <jiangxiaoming@outlook.com> Change-Id: Ic47f5e8627923c951333c70004850b53ed4cab06
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files 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 \