summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-12-27 09:07:32 -0800
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2018-12-27 10:15:16 -0800
commit223548d479c0bde67aa8d05a1f0f13e0afb0aab1 (patch)
tree612570ca2c79ceaa622cef2347e71ccdbcca5589
parentd12ff50773b0b078ec6fa94201035b7d7bcc7d34 (diff)
install-dep: force osleap boost dep install
Change-Id: I4a053f41eef138fc0e6db7e2650860c0ac999552 Signed-off-by: Florin Coras <fcoras@cisco.com> Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9868d9ae0d3..6f79ce52ef3 100644
--- a/Makefile
+++ b/Makefile
@@ -129,14 +129,14 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
ifeq ($(OS_ID),opensuse)
ifeq ($(SUSE_NAME),Tumbleweed)
- RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+ RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc
RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
endif
ifeq ($(SUSE_ID),15.0)
- RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
+ 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
else
- RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+ RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6
RPM_SUSE_PYTHON_DEPS += python-virtualenv
endif
endif
@@ -310,7 +310,7 @@ else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
@sudo -E zypper refresh
- @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+ @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
@sudo -E zypper refresh
@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)