api: clean up use of deprecated flag

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index fe5e6e9..cf4cfad 100644 (file)
--- 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
@@ -90,6 +91,8 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
        DEB_DEPENDS += libssl1.0-dev
        DEB_DEPENDS += python-all python-pip
        DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
+       DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 else
        DEB_DEPENDS += libssl-dev
 endif
@@ -107,6 +110,7 @@ RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
 RPM_DEPENDS += ccache
 RPM_DEPENDS += xmlto
+RPM_DEPENDS += elfutils-libelf-devel
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -130,7 +134,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 +294,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 \