X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=29c4c962254666e73e15235f7c2aa58c493bebea;hb=refs%2Fchanges%2F88%2F28688%2F4;hp=feb23e50cb83f38054981e05d30fd99631cd8e26;hpb=4a76d6f6da035220917097bc047b08bc58254803;p=vpp.git 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 \