From 6dc1fc03c13027f3fd1553af4d23ed00ea929985 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 21 Dec 2015 10:34:41 -0500 Subject: Update hwloc; don't require libpciaccess on OS X - hwloc 1.11.2 is available. - libpciaccess is not supported on OS X; don't require it there. --- var/spack/packages/hwloc/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/packages/hwloc/package.py b/var/spack/packages/hwloc/package.py index 452a7d7ce3..35a526ceb8 100644 --- a/var/spack/packages/hwloc/package.py +++ b/var/spack/packages/hwloc/package.py @@ -15,15 +15,17 @@ class Hwloc(Package): homepage = "http://www.open-mpi.org/projects/hwloc/" url = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz" + version('1.11.2', '486169cbe111cdea57be12638828ebbf', + url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.2.tar.bz2') version('1.11.1', '002742efd3a8431f98d6315365a2b543', url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2') version('1.9', '1f9f9155682fe8946a97c08896109508') - depends_on('libpciaccess') + # libpciaccess is not supported on OS X + depends_on('libpciaccess', when='=linux') def install(self, spec, prefix): configure("--prefix=%s" % prefix) make() make("install") - -- cgit v1.2.3-60-g2f50 From 6831ee6f0a98bfdc2c0847d0a0dea6c91fcb1d9b Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 22 Dec 2015 16:24:05 -0500 Subject: Skip installing libpciaccess on Darwin --- var/spack/packages/hwloc/package.py | 3 +-- var/spack/packages/libpciaccess/package.py | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/packages/hwloc/package.py b/var/spack/packages/hwloc/package.py index 35a526ceb8..7ebede76a3 100644 --- a/var/spack/packages/hwloc/package.py +++ b/var/spack/packages/hwloc/package.py @@ -21,8 +21,7 @@ class Hwloc(Package): url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2') version('1.9', '1f9f9155682fe8946a97c08896109508') - # libpciaccess is not supported on OS X - depends_on('libpciaccess', when='=linux') + depends_on('libpciaccess') def install(self, spec, prefix): configure("--prefix=%s" % prefix) diff --git a/var/spack/packages/libpciaccess/package.py b/var/spack/packages/libpciaccess/package.py index 6022fc34a3..403bafbbd2 100644 --- a/var/spack/packages/libpciaccess/package.py +++ b/var/spack/packages/libpciaccess/package.py @@ -1,4 +1,5 @@ from spack import * +import os.path class Libpciaccess(Package): """Generic PCI access library.""" @@ -13,6 +14,12 @@ class Libpciaccess(Package): depends_on('libtool') def install(self, spec, prefix): + # libpciaccess does not support OS X + if spec.satisfies('=darwin-x86_64'): + # create a dummy directory + mkdir(prefix.lib) + return + from subprocess import call call(["./autogen.sh"]) configure("--prefix=%s" % prefix) -- cgit v1.2.3-60-g2f50