X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=37dbf593564463d0a6f0722fe901be1773b9d59c;hb=4a332319cc09cd6fadf58c4cdbe941732b488b99;hp=4ac4c9aa9c3543f1aba6f82035cad9ac4c26baf3;hpb=b495e34b00a55c61fa91064beeae9096f314b64f;p=vpp.git diff --git a/Makefile b/Makefile index 4ac4c9aa9c3..37dbf593564 100644 --- a/Makefile +++ b/Makefile @@ -84,15 +84,11 @@ 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-11 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-11 clang-format-11 LIBFFI=libffi8ubuntu1 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10) DEB_DEPENDS += virtualenv @@ -101,9 +97,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11) DEB_DEPENDS += clang-11 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