aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Kern <ejk@cisco.com>2020-02-05 15:45:26 -0700
committerDave Wallace <dwallacelf@gmail.com>2020-02-07 19:13:54 +0000
commitc03bb3b431c6e2c6953871121a88dc8c1b1fac26 (patch)
tree3af19a240bf32c4efb6331cf6e38304e77a43703
parent84382ae45c2cf694ef7faf4a87d60c1546869301 (diff)
build: Makefile dep change for ubuntu
Alter dep name and location for ubuntu-20 package naming Dropping 14.04 support while keeping 16.04 and 18.04 Dropping python2-dev for ubuntu-20 Type: make Change-Id: I324aa646cdb6e13d39b7a99722857e59906b0843 Signed-off-by: Ed Kern <ejk@cisco.com>
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1a9ff86e0b0..f69a688e881 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +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 python-dev
+DEB_DEPENDS += python-all python3-all python3-setuptools
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
@@ -73,8 +73,10 @@ 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
+ifeq ($(OS_VERSION_ID),16.04)
+ DEB_DEPENDS += python-dev
+else ifeq ($(OS_VERSION_ID),18.04)
+ DEB_DEPENDS += python-dev
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports