aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2020-05-12 12:22:18 +0200
committerFlorin Coras <florin.coras@gmail.com>2020-05-15 23:42:40 +0000
commita416493d3b9017181054d5ff24d5efdcdb5bf39f (patch)
tree960b1d9cafdcbb91f218999c14b82d86a42af6c8 /Makefile
parentd466c0cafcbc3189b5982f3df8d4cd4d553704ce (diff)
misc: fix ubuntu 20.04 python deps
Type: fix Change-Id: I9cdfbffd6333d090f970422bf047aaa90c1e4c65 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 35140711d09..709fb73dce9 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,7 @@ 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 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
@@ -75,20 +74,21 @@ DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil
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
+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