From fb1135da992ee6d578a8a1ad810217e0c7a0b457 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 9 Nov 2021 13:58:12 -0500 Subject: build: install clang-format-11 - Don't make it the default yet Type: make Change-Id: I3aabfd32f7ffd99e10db372747a0ba65fdc76db2 Signed-off-by: Dave Wallace --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 156919a9dff..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-11 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-11 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 -- cgit 1.2.3-korg