diff options
| author |   Damjan Marion <damarion@cisco.com> | 2020-12-12 19:09:31 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2020-12-18 11:06:33 +0100 |
| commit | 942542f7c1c3aae62a88612b8702a45f0d3b0e35 (patch) | |
| tree | 6955c8198ccc33eb0e5b24c250853f6b27d29230 /Makefile | |
| parent | 44cae547370cc49fbc65127aad6d4f5211716383 (diff) | |
misc: migrate from GNU indent to clang-format
Type: make
Change-Id: I085dcd6fe826da14d456f84a23355310bdc5d1e9
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -14,6 +14,7 @@ export WS_ROOT=$(CURDIR) export BR=$(WS_ROOT)/build-root CCACHE_DIR?=$(BR)/.ccache +SHELL:=/bin/bash GDB?=gdb PLATFORM?=vpp SAMPLE_PLUGIN?=no @@ -64,7 +65,7 @@ endif DEB_DEPENDS = curl build-essential autoconf automake ccache DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config -DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev +DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml @@ -77,11 +78,12 @@ LIBFFI=libffi6 # works on all but 20.04 and debian-testing ifeq ($(OS_VERSION_ID),18.04) DEB_DEPENDS += python-dev python-all python-pip python-virtualenv DEB_DEPENDS += libssl-dev - DEB_DEPENDS += clang-9 + DEB_DEPENDS += clang-9 clang-format-10 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 LIBFFI=libffi7 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9) DEB_DEPENDS += libssl1.0-dev @@ -613,7 +615,10 @@ compdb: .PHONY: checkstyle checkstyle: checkfeaturelist - @build-root/scripts/checkstyle.sh +ifeq ($(shell which clang-format-10),) + @sudo apt-get install -y clang-format-10 +endif + @extras/scripts/checkstyle.sh .PHONY: checkstyle-commit checkstyle-commit: @@ -627,7 +632,7 @@ checkstyle-all: checkstyle-commit checkstyle checkstyle-test .PHONY: fixstyle fixstyle: - @build-root/scripts/checkstyle.sh --fix + @extras/scripts/checkstyle.sh --fix .PHONY: checkstyle-api checkstyle-api: |