ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: install clang-format-11

Browse Source 
- Don't make it the default yet

Type: make

Change-Id: I3aabfd32f7ffd99e10db372747a0ba65fdc76db2
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace
2021-11-09 13:58:12 -05:00
parent e7dda6b034
commit fb1135da99
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -84,14 +84,18 @@ else ifeq ($(OS_VERSION_ID),20.04)
DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) 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 LIBFFI=libffi7
else ifeq ($(OS_VERSION_ID),20.10) else ifeq ($(OS_VERSION_ID),20.10)
DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += python3-virtualenv
DEB_DEPENDS += libssl-dev DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) 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
LIBFFI=libffi8ubuntu1 # 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) else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
DEB_DEPENDS += python3-virtualenv virtualenv DEB_DEPENDS += python3-virtualenv virtualenv
DEB_DEPENDS += libssl-dev DEB_DEPENDS += libssl-dev

2
extras/scripts/checkstyle.sh
View File

@ -18,6 +18,8 @@ set -eEo pipefail
CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+' CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+'
CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py" 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} CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-10}
GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1" GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1"
CLANG_FORMAT_DIFF_ARGS="-style file -p1" CLANG_FORMAT_DIFF_ARGS="-style file -p1"