summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2017-03-17 10:09:09 -0400
committerAdam J. Stewart <ajstewart426@gmail.com>2017-03-17 09:09:09 -0500
commite7bf8034b0e814a53cff39651c053cd3f3923cd5 (patch)
tree8db7656059b98064ea2166a3bafd0e325e66523c
parent1124bdc99ee84c26201c40536d9b04dac74d7f6a (diff)
downloadspack-e7bf8034b0e814a53cff39651c053cd3f3923cd5.tar.gz
spack-e7bf8034b0e814a53cff39651c053cd3f3923cd5.tar.bz2
spack-e7bf8034b0e814a53cff39651c053cd3f3923cd5.tar.xz
spack-e7bf8034b0e814a53cff39651c053cd3f3923cd5.zip
libpciaccess: Convert to AutotoolsPackage, remove Darwin work-around (#3459)
* libpciaccess: Convert to AutotoolsPackage, remove Darwin work-around Other packages that depend on libpciaccess can do so via a conditional dependency (via a variant); we don’t need a dummy package for Darwin any more. * Disable libpciaccess dependency on non-Darwin platforms * hwloc: Remove direct dependency on libpciaccess
-rw-r--r--var/spack/repos/builtin/packages/hwloc/package.py1
-rw-r--r--var/spack/repos/builtin/packages/intel-gpu-tools/package.py3
-rw-r--r--var/spack/repos/builtin/packages/libdrm/package.py3
-rw-r--r--var/spack/repos/builtin/packages/libpciaccess/package.py14
-rw-r--r--var/spack/repos/builtin/packages/mvapich2/package.py3
5 files changed, 8 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py
index 4d027344e9..0030d5ffde 100644
--- a/var/spack/repos/builtin/packages/hwloc/package.py
+++ b/var/spack/repos/builtin/packages/hwloc/package.py
@@ -22,6 +22,7 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
+
from spack import *
import sys
diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py
index f72ebf76e7..53a6a04e3f 100644
--- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py
+++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
+import sys
class IntelGpuTools(AutotoolsPackage):
@@ -41,7 +42,7 @@ class IntelGpuTools(AutotoolsPackage):
version('1.16', '3996f10fc86a28ec59e1cf7b227dad78')
depends_on('libdrm@2.4.64:')
- depends_on('libpciaccess@0.10:')
+ depends_on('libpciaccess@0.10:', when=(sys.platform != 'darwin'))
depends_on('cairo@1.12.0:')
depends_on('glib')
diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py
index ab9661269e..bebc20f089 100644
--- a/var/spack/repos/builtin/packages/libdrm/package.py
+++ b/var/spack/repos/builtin/packages/libdrm/package.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
+import sys
class Libdrm(Package):
@@ -37,7 +38,7 @@ class Libdrm(Package):
version('2.4.59', '105ac7af1afcd742d402ca7b4eb168b6')
version('2.4.33', '86e4e3debe7087d5404461e0032231c8')
- depends_on('libpciaccess@0.10:')
+ depends_on('libpciaccess@0.10:', when=(sys.platform != 'darwin'))
depends_on('libpthread-stubs')
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py
index f4a3cf7157..94b9dfe173 100644
--- a/var/spack/repos/builtin/packages/libpciaccess/package.py
+++ b/var/spack/repos/builtin/packages/libpciaccess/package.py
@@ -25,7 +25,7 @@
from spack import *
-class Libpciaccess(Package):
+class Libpciaccess(AutotoolsPackage):
"""Generic PCI access library."""
homepage = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
@@ -36,15 +36,3 @@ class Libpciaccess(Package):
depends_on('libtool', type='build')
depends_on('pkg-config@0.9.0:', type='build')
depends_on('util-macros', type='build')
-
- def install(self, spec, prefix):
- # libpciaccess does not support OS X
- if spec.satisfies('platform=darwin'):
- # create a dummy directory
- mkdir(prefix.lib)
- return
-
- configure('--prefix={0}'.format(prefix))
-
- make()
- make('install')
diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py
index de809c4fed..55b593f623 100644
--- a/var/spack/repos/builtin/packages/mvapich2/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2/package.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
+import sys
class Mvapich2(Package):
@@ -94,7 +95,7 @@ class Mvapich2(Package):
# FIXME : CUDA support is missing
depends_on('bison')
- depends_on('libpciaccess')
+ depends_on('libpciaccess', when=(sys.platform != 'darwin'))
def url_for_version(self, version):
base_url = "http://mvapich.cse.ohio-state.edu/download"