Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: fix use-after-free
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e580a31
..
1e6f9ec
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-59,22
+59,36
@@
else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumblewee
PKG=rpm
endif
PKG=rpm
endif
+# on ubuntu 18.04 prefer gcc-8 if it is installed and CC is not set
+ifeq ($(OS_VERSION_ID)-$(CC)-$(shell which gcc-8 > /dev/null; echo $$?),18.04-cc-0)
+ CC = gcc-8
+endif
+
# +libganglia1-dev if building the gmond plugin
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
# +libganglia1-dev if building the gmond plugin
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
python-dev
-DEB_DEPENDS += python-virtualenv python-pip
libffi6
check
+DEB_DEPENDS += python-all python3-all python3-setuptools
+DEB_DEPENDS += python-virtualenv python-pip check
DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
-DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
yamllint
+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
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),14.04)
+
+LIBFFI=libffi6 # works on all but 20.04
+
+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
DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libssl-dev
+ DEB_DEPENDS += gcc-8
+else ifeq ($(OS_VERSION_ID),20.04)
+ LIBFFI=libffi7
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports
@@
-84,6
+98,8
@@
else
DEB_DEPENDS += libssl-dev
endif
DEB_DEPENDS += libssl-dev
endif
+DEB_DEPENDS += $(LIBFFI)
+
RPM_DEPENDS = redhat-lsb glibc-static
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS = redhat-lsb glibc-static
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
@@
-93,21
+109,20
@@
RPM_DEPENDS += selinux-policy selinux-policy-devel
RPM_DEPENDS += ninja-build
RPM_DEPENDS += libuuid-devel
RPM_DEPENDS += mbedtls-devel
RPM_DEPENDS += ninja-build
RPM_DEPENDS += libuuid-devel
RPM_DEPENDS += mbedtls-devel
-RPM_DEPENDS += yamllint
-RPM_DEPENDS += python3-devel # needed for python3 -m pip install psutil
ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils
RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel
ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils
RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel
+ RPM_DEPENDS += python3-devel # needed for python3 -m pip install psutil
RPM_DEPENDS += python3-ply # for vppapigen
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
RPM_DEPENDS += python3-ply # for vppapigen
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
- RPM_DEPENDS +=
dnf
-utils
+ RPM_DEPENDS +=
yum
-utils
RPM_DEPENDS += compat-openssl10
RPM_DEPENDS += compat-openssl10
- RPM_DEPENDS += python3-devel python3-ply
+ RPM_DEPENDS += python3
6
-devel python3-ply
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'Development Tools'
RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'Development Tools'
@@
-204,6
+219,8
@@
help:
@echo " run-vat - run vpp-api-test tool"
@echo " pkg-deb - build DEB packages"
@echo " pkg-deb-debug - build DEB debug packages"
@echo " run-vat - run vpp-api-test tool"
@echo " pkg-deb - build DEB packages"
@echo " pkg-deb-debug - build DEB debug packages"
+ @echo " pkg-snap - build SNAP package"
+ @echo " snap-clean - clean up snap build environment"
@echo " vom-pkg-deb - build vom DEB packages"
@echo " vom-pkg-deb-debug - build vom DEB debug packages"
@echo " pkg-rpm - build RPM packages"
@echo " vom-pkg-deb - build vom DEB packages"
@echo " vom-pkg-deb-debug - build vom DEB debug packages"
@echo " pkg-rpm - build RPM packages"
@@
-448,7
+465,7
@@
papi-wipe: test-wipe-papi
.PHONY: test-wipe-papi
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:
.PHONY: test-help
test-help:
@@
-575,6
+592,20
@@
run-vat:
pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
+.PHONY: pkg-snap
+pkg-snap:
+ cd extras/snap ; \
+ ./prep ; \
+ SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY=8G \
+ SNAPCRAFT_BUILD_ENVIRONMENT_CPU=6 \
+ snapcraft --debug
+
+.PHONY: snap-clean
+snap-clean:
+ cd extras/snap ; \
+ snapcraft clean ; \
+ rm -f *.snap *.tgz
+
.PHONY: vom-pkg-deb
vom-pkg-deb: pkg-deb
$(call make,$(PLATFORM),vom-package-deb)
.PHONY: vom-pkg-deb
vom-pkg-deb: pkg-deb
$(call make,$(PLATFORM),vom-package-deb)
@@
-629,9
+660,8
@@
cscope: cscope.files
@cscope -b -q -v
.PHONY: checkstyle
@cscope -b -q -v
.PHONY: checkstyle
-checkstyle:
+checkstyle:
checkfeaturelist
@build-root/scripts/checkstyle.sh
@build-root/scripts/checkstyle.sh
- yamllint $(WS_ROOT)/src
.PHONY: checkstyle-commit
checkstyle-commit:
.PHONY: checkstyle-commit
checkstyle-commit:
@@
-665,7
+695,7
@@
featurelist: centos-pyyaml
.PHONY: checkfeaturelist
checkfeaturelist: centos-pyyaml
.PHONY: checkfeaturelist
checkfeaturelist: centos-pyyaml
- @build-root/scripts/fts.py --validate --
git-status
+ @build-root/scripts/fts.py --validate --
all
#
# Build the documentation
#
# Build the documentation