summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2016-06-10 14:29:57 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2016-06-17 10:44:28 -0500
commit4eeaff175cc6c9fd15a7d2455e1e0663ad147aca (patch)
tree0f72bd8029f41ebd0423e60af37433b05d515e5e
parenta660c60eb1997317fe0e99054a99cc1cea1d3a56 (diff)
downloadspack-4eeaff175cc6c9fd15a7d2455e1e0663ad147aca.tar.gz
spack-4eeaff175cc6c9fd15a7d2455e1e0663ad147aca.tar.bz2
spack-4eeaff175cc6c9fd15a7d2455e1e0663ad147aca.tar.xz
spack-4eeaff175cc6c9fd15a7d2455e1e0663ad147aca.zip
Allow packages to build
-rw-r--r--var/spack/repos/builtin/packages/py-astropy/package.py3
-rw-r--r--var/spack/repos/builtin/packages/py-h5py/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-iminuit/package.py12
-rw-r--r--var/spack/repos/builtin/packages/py-sncosmo/package.py3
4 files changed, 9 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py
index 09d1688f4b..bac794e551 100644
--- a/var/spack/repos/builtin/packages/py-astropy/package.py
+++ b/var/spack/repos/builtin/packages/py-astropy/package.py
@@ -60,4 +60,5 @@ class PyAstropy(Package):
def install(self, spec, prefix):
python('setup.py', 'build', '--use-system-cfitsio',
'--use-system-expat')
- python('setup.py', 'install', '--prefix={0}'.format(prefix))
+ python('setup.py', 'install', '--single-version-externally-managed',
+ '--root=/', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py
index a92fc3c9c7..1b8675ecf2 100644
--- a/var/spack/repos/builtin/packages/py-h5py/package.py
+++ b/var/spack/repos/builtin/packages/py-h5py/package.py
@@ -39,6 +39,7 @@ class PyH5py(Package):
variant('mpi', default=False, description='Build with MPI support')
extends('python', ignore=r'bin/cy.*')
+
depends_on('hdf5@1.8.4:+mpi', when='+mpi')
depends_on('hdf5@1.8.4:~mpi', when='~mpi')
depends_on('py-numpy@1.6.1:')
@@ -53,4 +54,5 @@ class PyH5py(Package):
env['CC'] = spec['mpi'].mpicc
python('setup.py', 'configure', '--mpi')
- python('setup.py', 'install', '--prefix={0}'.format(prefix))
+ python('setup.py', 'install', '--single-version-externally-managed',
+ '--root=/', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py
index 5a42268a73..557cf19c19 100644
--- a/var/spack/repos/builtin/packages/py-iminuit/package.py
+++ b/var/spack/repos/builtin/packages/py-iminuit/package.py
@@ -42,13 +42,5 @@ class PyIminuit(Package):
depends_on('py-matplotlib')
def install(self, spec, prefix):
- site_packages = '{0}/lib/python{1}/site-packages'.format(
- prefix, spec['python'].version.up_to(2))
-
- # site-packages directory must already exist
- mkdirp(site_packages)
-
- # PYTHONPATH must include site-packages directory
- env['PYTHONPATH'] += ':{0}'.format(site_packages)
-
- python('setup.py', 'install', '--prefix={0}'.format(prefix))
+ python('setup.py', 'install', '--single-version-externally-managed',
+ '--root=/', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py
index d40623ffa1..58c4625a4f 100644
--- a/var/spack/repos/builtin/packages/py-sncosmo/package.py
+++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py
@@ -48,4 +48,5 @@ class PySncosmo(Package):
depends_on('py-nestle')
def install(self, spec, prefix):
- python('setup.py', 'install', '--prefix={0}'.format(prefix))
+ python('setup.py', 'install', '--single-version-externally-managed',
+ '--root=/', '--prefix={0}'.format(prefix))