From 39da1eb03d1bf02cf65da02af93f7d90395275f1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 14 Nov 2011 23:42:38 +0000 Subject: [PATCH] Update build for ARM support --- hwloc.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hwloc.spec b/hwloc.spec index 7e2fa2f..62f8e0f 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,15 +1,15 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc Version: 1.3 -Release: 0%{?dist} +Release: 1%{?dist} License: BSD Group: Applications/System URL: http://www.open-mpi.org/projects/hwloc/ Source0: http://www.open-mpi.org/software/hwloc/v1.3/downloads/%{name}-%{version}.tar.bz2 #Patch0: hwloc-1.2.1.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libibverbs-devel pciutils-devel -%ifnarch s390 s390x +%ifnarch s390 s390x %{arm} BuildRequires: numactl-devel %endif @@ -61,7 +61,6 @@ Headers and shared object symbolic links for the hwloc. %{__make} %{?_smp_mflags} V=1 %install -%{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" # We don't ship .la files. @@ -74,9 +73,6 @@ Headers and shared object symbolic links for the hwloc. %check %{__make} check -%clean -%{__rm} -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -106,6 +102,8 @@ Headers and shared object symbolic links for the hwloc. %changelog +* Mon Nov 14 2011 Peter Robinson - 1.3-1 +- Update build for ARM support * Sat Oct 15 2011 Jirka Hladky - 1.3-0 - 1.3 release - added dependency on libibverbs-devel pciutils-devel