X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=29c4c962254666e73e15235f7c2aa58c493bebea;hb=c4665093cdb0a8122d9640b6f5b3acd627918f32;hp=fe5e6e950bab8d1378f4c651266c61c3fc4cfec0;hpb=81b95c1fe2ece45ee2a5d895631b608733384182;p=vpp.git diff --git a/Makefile b/Makefile index fe5e6e950ba..29c4c962254 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,7 @@ ifeq ($(OS_VERSION_ID),18.04) else ifeq ($(OS_VERSION_ID),20.04) DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev + DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) LIBFFI=libffi7 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += libssl-dev @@ -130,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 @@ -290,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 \