From d185427282d4342aedd66eff6583d35b4487b7b3 Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Tue, 1 Aug 2017 12:46:41 -0400 Subject: 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 1abf1866e85..8bfc46fa5b8 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,11 @@ else RPM_DEPENDS_GROUPS = 'Development Tools' endif 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 ganglia-devel epel-rpm-macros ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) EPEL_DEPENDS += lcov -- cgit 1.2.3-korg