From 33129bb9a3e954b7c9ba7a72f16550b1cf91dc9e Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Tue, 1 Aug 2017 12:46:41 -0400 Subject: [PATCH] Fix nasm deps for Fedora. Fedora 24 and 25 distro already includes nasm 2.12 but Centos does not as yet. Change-Id: I060ea8b7b7892ac8444d850398ed1c9100631fbc Signed-off-by: Thomas F Herbert --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c43a0ee928..c8eba6e3ed3 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,11 @@ endif # +ganglia-devel if building the ganglia plugin RPM_DEPENDS += chrpath libffi-devel rpm-build -RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm +ifeq ($(OS_ID),fedora) + RPM_DEPENDS += nasm +else + 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 EPEL_DEPENDS = libconfuse-devel epel-rpm-macros ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) EPEL_DEPENDS += lcov -- 2.16.6