nat: tweak rfc7857 tcp connection tracking

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ac4c9a..fef563b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ DEB_DEPENDS += python3-virtualenv
 DEB_DEPENDS += libssl-dev
 DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 DEB_DEPENDS += iperf3 # for 'make test TEST=vcl'
+DEB_DEPENDS += nasm
 
 LIBFFI=libffi6 # works on all but 20.04 and debian-testing
 
@@ -84,26 +85,20 @@ ifeq ($(OS_VERSION_ID),20.04)
        DEB_DEPENDS += python3-virtualenv
        DEB_DEPENDS += libssl-dev
        DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
-       # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-       #       when clang-format-10 is removed
-       DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+       DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi7
        DEB_DEPENDS += enchant-2  # for docs
 else ifeq ($(OS_VERSION_ID),20.10)
-       # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-       #       when clang-format-10 is removed
-       DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+       DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi8ubuntu1
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
        DEB_DEPENDS += virtualenv
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11)
        DEB_DEPENDS += virtualenv
-       DEB_DEPENDS += clang-11 clang-format-11
+       DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi7
 else
-       # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-       #       when clang-format-10 is removed
-       DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+       DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi7
        DEB_DEPENDS += enchant-2  # for docs
 endif
@@ -122,6 +117,7 @@ RPM_DEPENDS += ccache
 RPM_DEPENDS += xmlto
 RPM_DEPENDS += elfutils-libelf-devel
 RPM_DEPENDS += libnl3-devel libmnl-devel
+RPM_DEPENDS += nasm
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -162,7 +158,7 @@ RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info
 RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
 RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply
 
-RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel
+RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel nasm
 RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel
 
 RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip