Remove libsubunit 'dependency' for openSUSE and fix NASM

This patch addresses the unrequired dependency on libsubunit for
opensuse; it also adds the required new dependency on check (add
check-devel to the top-level Makefile).
It adds some extra logic to install the correct NASM version to support
AESNI.

Change-Id: Ie368dd8f8485a67ab125e735fd12cbe25b9b588f
Signed-off-by: Marco Varlese <marco.varlese@suse.com>

diff --git a/Makefile b/Makefile
index 8b96dce..aef879c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,17 @@ else ifeq ($(findstring y,$(AESNI)),y)
        RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 endif
 
-RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath clang distribution-release gcc6 glibc-devel-static
+RPM_SUSE_DEPENDS = autoconf automake bison ccache check-devel chrpath clang distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel indent libopenssl-devel libtool make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel rpm-build
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow libnuma-devel rpm-build
+
+ifeq ($(OS_ID),opensuse)
+ifeq ($(findstring y,$(AESNI)),y)
+       RPM_SUSE_DEPENDS += https://download.opensuse.org/tumbleweed/repo/oss/suse/x86_64/nasm-2.13.01-2.1.x86_64.rpm
+else
+       RPM_SUSE_DEPENDS += nasm
+endif
+endif
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf

diff --git a/test/ext/Makefile b/test/ext/Makefile
index 6436302..1bd035d 100644 (file)
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -6,7 +6,10 @@ ifeq ($(filter centos,$(OS_ID)),$(OS_ID))
 CPPBIN=
 endif
 
-LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lsubunit -lrt -lm -lvapiclient
+LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient
+ifneq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+LIBS += -lsubunit
+endif
 CFLAGS = -std=gnu99 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(BINDIR)
 CPPFLAGS = -std=c++11 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(BINDIR)