X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=a35fac59c0b2097227376e3789c012012ba71d20;hb=9f84e70c6dba7b7e9b532af40bdbf688d416862a;hp=709fb73dce952228931549c0d4b365a7a3d464b1;hpb=a416493d3b9017181054d5ff24d5efdcdb5bf39f;p=vpp.git diff --git a/Makefile b/Makefile index 709fb73dce9..a35fac59c0b 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ ifeq ($(OS_VERSION_ID),18.04) DEB_DEPENDS += clang-9 else ifeq ($(OS_VERSION_ID),20.04) DEB_DEPENDS += python3-virtualenv + DEB_DEPENDS += libssl-dev LIBFFI=libffi7 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += libssl-dev @@ -104,6 +105,8 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel RPM_DEPENDS += mbedtls-devel +RPM_DEPENDS += ccache +RPM_DEPENDS += xmlto ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -117,7 +120,7 @@ ifeq ($(OS_ID),fedora) else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) RPM_DEPENDS += yum-utils RPM_DEPENDS += compat-openssl10 - RPM_DEPENDS += python36-devel python3-ply + RPM_DEPENDS += python2-devel python36-devel python3-ply RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'Development Tools' @@ -317,6 +320,8 @@ ifeq ($(OS_ID),rhel) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) + @sudo -E dnf install $(CONFIRM) epel-release + @sudo -E dnf config-manager --set-enabled PowerTools @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) else ifeq ($(OS_ID),centos)