ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix 'make build VPP_EXTRA_CMAKE_ARGS=-DVPP_ENABLE_SANITIZE_ADDR=ON' error on Centos 7

Browse Source 
Type: fix

Signed-off-by: jiangxiaoming <jiangxiaoming@outlook.com>
Change-Id: Ic47f5e8627923c951333c70004850b53ed4cab06
This commit is contained in:
jiangxiaoming
2020-08-27 16:00:16 +08:00
committed by Benoît Ganne
parent 50bd165599
commit 9f1dbd20b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -131,7 +131,7 @@ else
RPM_DEPENDS += python36-ply # for vppapigen RPM_DEPENDS += python36-ply # for vppapigen
RPM_DEPENDS += python3-devel python3-pip RPM_DEPENDS += python3-devel python3-pip
RPM_DEPENDS += python-virtualenv python36-jsonschema RPM_DEPENDS += python-virtualenv python36-jsonschema
RPM_DEPENDS += devtoolset-9 RPM_DEPENDS += devtoolset-9 devtoolset-9-libasan-devel
RPM_DEPENDS += cmake3 RPM_DEPENDS += cmake3
RPM_DEPENDS_GROUPS = 'Development Tools' RPM_DEPENDS_GROUPS = 'Development Tools'
endif endif
@ -291,7 +291,7 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
exit 0 exit 0
else ifneq ("$(wildcard /etc/redhat-release)","") else ifneq ("$(wildcard /etc/redhat-release)","")
@for i in $(RPM_DEPENDS) ; do \ @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") ; \ MISSING+=$$(rpm -q $$RPM | grep "^package") ; \
done ; \ done ; \
if [ -n "$$MISSING" ] ; then \ if [ -n "$$MISSING" ] ; then \