build: opensuse: remove nasm, change to clang
Type: make
Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>
Change-Id: I3951be5be95a7fb76f54c4ce0daab0748cb8419c
diff --git a/Makefile b/Makefile
index 87ab40f..affcc49 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@
RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply
-RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel
+RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel nasm
RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel
RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip
diff --git a/extras/rpm/opensuse/Dockerfile b/extras/rpm/opensuse/Dockerfile
index 032c5d1..47ca271 100644
--- a/extras/rpm/opensuse/Dockerfile
+++ b/extras/rpm/opensuse/Dockerfile
@@ -12,4 +12,4 @@
RUN ln -s /usr/bin/cmake /usr/bin/cmake3
RUN UNATTENDED=y make install-ext-deps
RUN make pkg-rpm
-CMD ["/bin/bash"]
\ No newline at end of file
+CMD ["/bin/bash"]
diff --git a/extras/rpm/opensuse/vpp.spec b/extras/rpm/opensuse/vpp.spec
index 403d25b..b562eac 100644
--- a/extras/rpm/opensuse/vpp.spec
+++ b/extras/rpm/opensuse/vpp.spec
@@ -3,6 +3,8 @@
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
+# Copyright (c) 2022 Nordix Foundation.
+#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
@@ -12,10 +14,6 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
%define _vpp_build_dir %{buildroot}/../../BUILD/vpp-%{version}/build-root
%define _vpp_install_dir %{_vpp_build_dir}/install-vpp-native/
%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib64
@@ -34,6 +32,7 @@
BuildRequires: automake
BuildRequires: bison
BuildRequires: ccache
+BuildRequires: clang
BuildRequires: check-devel
BuildRequires: chrpath
BuildRequires: distribution-release
@@ -141,7 +140,7 @@
export VPP_BUILD_USER=suse
export VPP_BUILD_HOST=SUSE
-make -C build-root V=1 CC=gcc-7 CXX=g++-7 PLATFORM=vpp TAG=vpp install-packages
+make -C build-root V=1 PLATFORM=vpp TAG=vpp install-packages
cd %{_vpp_build_dir}/../src/vpp-api/python && %{py3_build}