From: Paul Vinciguerra Date: Wed, 20 Nov 2019 05:09:04 +0000 (-0500) Subject: build: Add missing package to Makefile X-Git-Tag: v20.05-rc0~151 X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=9d0ca07f1e4f48968724662e804310d9554d94b8 build: Add missing package to Makefile - add dependency for pip install psutil. See: https://github.com/giampaolo/psutil/blob/master/INSTALL.rst#linux Type: fix Signed-off-by: Paul Vinciguerra Change-Id: I3a24a9dbfc5093c02e2aedf08ac64f10821693f8 --- diff --git a/Makefile b/Makefile index 7bf6b7363fc..8084d822669 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,9 @@ DEB_DEPENDS += python-virtualenv python-pip libffi6 check 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 += 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) DEB_DEPENDS += libssl-dev else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @@ -91,12 +94,13 @@ 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 - RPM_DEPENDS += python3-devel python3-ply + RPM_DEPENDS += python3-ply # for vppapigen RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' @@ -110,7 +114,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) else RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python36-ply + RPM_DEPENDS += python36-ply # for vppapigen RPM_DEPENDS += python3-devel python3-pip RPM_DEPENDS += python-virtualenv python36-jsonschema RPM_DEPENDS += devtoolset-7