Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ethernet: add sanity checks to p2p_ethernet_add/del
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
67fdcd4
..
bf9cfcc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-59,11
+59,6
@@
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
# +libganglia1-dev if building the gmond plugin
DEB_DEPENDS = curl build-essential autoconf automake ccache
@@
-86,7
+81,7
@@
ifeq ($(OS_VERSION_ID),16.04)
else ifeq ($(OS_VERSION_ID),18.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 +=
gcc-8
+ DEB_DEPENDS +=
clang-9
else ifeq ($(OS_VERSION_ID),20.04)
LIBFFI=libffi7
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
else ifeq ($(OS_VERSION_ID),20.04)
LIBFFI=libffi7
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@
-132,7
+127,7
@@
else
RPM_DEPENDS += python36-ply # for vppapigen
RPM_DEPENDS += python3-devel python3-pip
RPM_DEPENDS += python-virtualenv python36-jsonschema
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
RPM_DEPENDS += cmake3
RPM_DEPENDS_GROUPS = 'Development Tools'
endif
@@
-465,7
+460,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: