From: Dave Wallace <dwallacelf@gmail.com>
Date: Tue, 9 Nov 2021 18:58:12 +0000 (-0500)
Subject: build: install clang-format-11
X-Git-Tag: v22.06-rc0~274
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=fb1135da992ee6d578a8a1ad810217e0c7a0b457;p=vpp.git

build: install clang-format-11

- Don't make it the default yet

Type: make

Change-Id: I3aabfd32f7ffd99e10db372747a0ba65fdc76db2
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---

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
diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh
index f8a83f3ec9d..4dcf77874d3 100755
--- a/extras/scripts/checkstyle.sh
+++ b/extras/scripts/checkstyle.sh
@@ -18,6 +18,8 @@ set -eEo pipefail
 CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+'
 CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py"
 
+# TODO: Remove clang-format-${CLANG_FORMAT_VER} from 'make install-deps' when
+#       CLANG_FORMAT_VER default value is upgraded
 CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-10}
 GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1"
 CLANG_FORMAT_DIFF_ARGS="-style file -p1"