ip: Dual loop error in midchain chksum

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index fde91c4..709fb73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,29 +65,36 @@ DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools
-DEB_DEPENDS += python-virtualenv python-pip libffi6 check
+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
 DEB_DEPENDS += python3-venv  # ensurepip
 DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 # python3.6 on 16.04 requires python36-dev
 
-ifeq ($(OS_VERSION_ID),16.04)
-       DEB_DEPENDS += python-dev
-       DEB_DEPENDS += libssl-dev
-else ifeq ($(OS_VERSION_ID),18.04)
-       DEB_DEPENDS += python-dev
+LIBFFI=libffi6 # works on all but 20.04
+
+ifeq ($(OS_VERSION_ID),18.04)
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
        DEB_DEPENDS += libssl-dev
+       DEB_DEPENDS += clang-9
+else ifeq ($(OS_VERSION_ID),20.04)
+       DEB_DEPENDS += python3-virtualenv
+       LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
        DEB_DEPENDS += libssl-dev
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
        APT_ARGS = -t jessie-backports
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
        DEB_DEPENDS += libssl1.0-dev
+       DEB_DEPENDS += python-all python-pip
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
 else
        DEB_DEPENDS += libssl-dev
 endif
 
+DEB_DEPENDS += $(LIBFFI)
+
 RPM_DEPENDS  = redhat-lsb glibc-static
 RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel
@@ -120,7 +127,7 @@ else
        RPM_DEPENDS += python36-ply  # for vppapigen
        RPM_DEPENDS += python3-devel python3-pip
        RPM_DEPENDS += python-virtualenv python36-jsonschema
-       RPM_DEPENDS += devtoolset-7
+       RPM_DEPENDS += devtoolset-9
        RPM_DEPENDS += cmake3
        RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
@@ -216,9 +223,11 @@ help:
        @echo " ctags                - (re)generate ctags database"
        @echo " gtags                - (re)generate gtags database"
        @echo " cscope               - (re)generate cscope database"
+       @echo " compdb               - (re)generate compile_commands.json"
        @echo " checkstyle           - check coding style"
        @echo " checkstyle-commit    - check commit message format"
        @echo " checkstyle-test      - check test framework coding style"
+       @echo " checkstyle-api       - check api for incompatible changes"
        @echo " fixstyle             - fix coding style"
        @echo " doxygen              - (re)generate documentation"
        @echo " bootstrap-doxygen    - setup Doxygen dependencies"
@@ -453,7 +462,7 @@ papi-wipe: test-wipe-papi
 
 .PHONY: test-wipe-papi
 test-wipe-papi:
-       @make -C test papi-wipe
+       @make -C test wipe-papi
 
 .PHONY: test-help
 test-help:
@@ -647,6 +656,10 @@ gtags: ctags
 cscope: cscope.files
        @cscope -b -q -v
 
+.PHONY: compdb
+compdb:
+       @ninja -C build-root/build-vpp_debug-native/vpp -t compdb > compile_commands.json
+
 .PHONY: checkstyle
 checkstyle: checkfeaturelist
        @build-root/scripts/checkstyle.sh
@@ -665,6 +678,10 @@ checkstyle-all: checkstyle-commit checkstyle checkstyle-test
 fixstyle:
        @build-root/scripts/checkstyle.sh --fix
 
+.PHONY: checkstyle-api
+checkstyle-api:
+       @extras/scripts/crcchecker.py --check-patch
+
 # necessary because Bug 1696324 - Update to python3.6 breaks PyYAML dependencies
 # Status:      CLOSED CANTFIX
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696324