aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Kern <ejk@cisco.com>2019-02-19 10:27:23 -0700
committerDamjan Marion <dmarion@me.com>2019-03-03 13:28:05 +0000
commita0005702c9593e3bd4367ca9d58e52c3bb576e75 (patch)
tree52d575bff2633c5257a0f80154ba63c25a002901
parent3d09e9992d198c62dee468e5019bf9dd9c2dffca (diff)
Makefile: correct opensuse 15.0 dep naming
This covers both naming option for opensuse leap15 dep package naming Change-Id: I2ade004e44e75c08afde0f3af42b33cd97ce0ebc Signed-off-by: Ed Kern <ejk@cisco.com>
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1dedf8804f4..692ea7bf8a1 100644
--- a/Makefile
+++ b/Makefile
@@ -135,8 +135,7 @@ ifeq ($(SUSE_NAME),Tumbleweed)
RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
endif
ifeq ($(SUSE_ID),15.0)
- RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc6
- RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+ RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
else
RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6
RPM_SUSE_PYTHON_DEPS += python-virtualenv
@@ -145,8 +144,8 @@ endif
ifeq ($(OS_ID),opensuse-leap)
ifeq ($(SUSE_ID),15.0)
- RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
- RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+ RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+ RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
endif
endif