From: Ed Kern Date: Tue, 19 Feb 2019 17:27:23 +0000 (-0700) Subject: Makefile: correct opensuse 15.0 dep naming X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a0005702c9593e3bd4367ca9d58e52c3bb576e75;p=vpp.git 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 --- 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