X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=4bd4d6d9fc63be195ac7add8250b193d6e72a401;hb=refs%2Fchanges%2F35%2F34335%2F2;hp=84ae60cb0759287c215d66166957a988573bb957;hpb=51a037daf2dca92e53d5991b5df850265c5a0784;p=vpp.git diff --git a/Makefile b/Makefile index 84ae60cb075..4bd4d6d9fc6 100644 --- a/Makefile +++ b/Makefile @@ -84,14 +84,18 @@ else ifeq ($(OS_VERSION_ID),20.04) DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) - DEB_DEPENDS += clang-format-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 LIBFFI=libffi7 else ifeq ($(OS_VERSION_ID),20.10) - DEB_DEPENDS += python3-virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) - DEB_DEPENDS += clang-format-10 - LIBFFI=libffi8ubuntu1 + 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 + LIBFFI=libffi8ubuntu1 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10) DEB_DEPENDS += python3-virtualenv virtualenv DEB_DEPENDS += libssl-dev