From e3ae09f8a317747249518afa952dbd36287b5e9a Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Fri, 6 Apr 2018 14:52:54 -0600 Subject: [PATCH] Makefile: Added new ifeq to cover opensuse leap15 So current makefile covers opensuse tumbleweed and current opensuse leap 12.3. Neither of these cover new leap 15 package naming. Cannot only use Name or ID do to release differences. Change-Id: I7ffcabb3a5af5b0789ba827209355050f6dc5204 Signed-off-by: Ed Kern --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 06e15f0d499..ac4c39ba7d9 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,7 @@ endif RPM_DEPENDS += chrpath libffi-devel rpm-build SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) +SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply @@ -125,13 +126,17 @@ RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build ifeq ($(OS_ID),opensuse) -ifneq ($(SUSE_NAME),Tumbleweed) - RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6 - RPM_SUSE_PYTHON_DEPS += python-virtualenv -else +ifeq ($(SUSE_NAME),Tumbleweed) RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc RPM_SUSE_PYTHON_DEPS += python2-virtualenv endif +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-virtualenv +else + RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python-virtualenv +endif endif RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) -- 2.16.6