diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-22 15:18:39 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-22 15:18:39 -0800 |
| commit | d1d23ec5e6b13b6d629ada633c8cddb1260ca492 (patch) | |
| tree | a9cd7e92bbfc189afb4592dec74ee225081a3adb /var | |
| parent | 1771063fe2b05dc1d7ecaa6f4665082de61d256e (diff) | |
| parent | 6831ee6f0a98bfdc2c0847d0a0dea6c91fcb1d9b (diff) | |
| download | spack-d1d23ec5e6b13b6d629ada633c8cddb1260ca492.tar.gz spack-d1d23ec5e6b13b6d629ada633c8cddb1260ca492.tar.bz2 spack-d1d23ec5e6b13b6d629ada633c8cddb1260ca492.tar.xz spack-d1d23ec5e6b13b6d629ada633c8cddb1260ca492.zip | |
Merge pull request #257 from eschnett/eschnett/hwloc-1.11.2
Update hwloc; don't require libpciaccess on OS X
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/hwloc/package.py | 3 | ||||
| -rw-r--r-- | var/spack/packages/libpciaccess/package.py | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/var/spack/packages/hwloc/package.py b/var/spack/packages/hwloc/package.py index 452a7d7ce3..7ebede76a3 100644 --- a/var/spack/packages/hwloc/package.py +++ b/var/spack/packages/hwloc/package.py @@ -15,6 +15,8 @@ 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') @@ -26,4 +28,3 @@ class Hwloc(Package): make() make("install") - 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) |