Merge pull request #257 from eschnett/eschnett/hwloc-1.11.2
Update hwloc; don't require libpciaccess on OS X
This commit is contained in:
commit
d1d23ec5e6
@ -15,6 +15,8 @@ class Hwloc(Package):
|
|||||||
homepage = "http://www.open-mpi.org/projects/hwloc/"
|
homepage = "http://www.open-mpi.org/projects/hwloc/"
|
||||||
url = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz"
|
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',
|
version('1.11.1', '002742efd3a8431f98d6315365a2b543',
|
||||||
url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2')
|
url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2')
|
||||||
version('1.9', '1f9f9155682fe8946a97c08896109508')
|
version('1.9', '1f9f9155682fe8946a97c08896109508')
|
||||||
@ -26,4 +28,3 @@ def install(self, spec, prefix):
|
|||||||
|
|
||||||
make()
|
make()
|
||||||
make("install")
|
make("install")
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from spack import *
|
from spack import *
|
||||||
|
import os.path
|
||||||
|
|
||||||
class Libpciaccess(Package):
|
class Libpciaccess(Package):
|
||||||
"""Generic PCI access library."""
|
"""Generic PCI access library."""
|
||||||
@ -13,6 +14,12 @@ class Libpciaccess(Package):
|
|||||||
depends_on('libtool')
|
depends_on('libtool')
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
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
|
from subprocess import call
|
||||||
call(["./autogen.sh"])
|
call(["./autogen.sh"])
|
||||||
configure("--prefix=%s" % prefix)
|
configure("--prefix=%s" % prefix)
|
||||||
|
Loading…
Reference in New Issue
Block a user