aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2017-10-10 09:30:33 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-10-10 13:28:13 +0000
commit50ec72111983ac4b3bf1d15d4382d9dca62d14ca (patch)
tree8c07ef608a045a104a6be2416a7d7e556ea9acde
parent7504e99a8b4ad1bff9bf64ba16fe00fa708e5b1a (diff)
openSUSE packages fix.
Adding the capability for CLANG for various opensuse distros. Added rpm-build package to build RPMs. Tiny edit for correct error message. Change-Id: I96a1e009d1daa44cbf8d0df60fc24091a50688d7 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c67b98d3729..a4e833e476f 100644
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,9 @@ 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 clang3_8 distribution-release gcc6 glibc-devel-static
+RPM_SUSE_DEPENDS = autoconf automake bison ccache 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_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel rpm-build
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -269,10 +269,10 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
- @sudo -E zypper -n update -y
- @sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)
+ @sudo -E zypper refresh
+ @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else
- $(error "This option currently works only on Ubuntu, Debian or Centos systems")
+ $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
endif
define make