diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2019-10-11 07:55:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 07:55:15 +0200 |
| commit | fd97f5c491ca3943e7b990382c3aa9befca14551 (patch) | |
| tree | 7ca60b78922827276d2f44f125e6c9184e1d6e1a | |
| parent | 884964d551d763ae22376e522ad01e23b5121bca (diff) | |
| download | spack-fd97f5c491ca3943e7b990382c3aa9befca14551.tar.gz spack-fd97f5c491ca3943e7b990382c3aa9befca14551.tar.bz2 spack-fd97f5c491ca3943e7b990382c3aa9befca14551.tar.xz spack-fd97f5c491ca3943e7b990382c3aa9befca14551.zip | |
Fixed constraints in recipes for packages that depends on fftw (#13125)
4 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index 196efaa19c..70df84c709 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -71,8 +71,9 @@ class Abinit(AutotoolsPackage): # depends_on('elpa~openmp', when='+elpa+mpi~openmp') # depends_on('elpa+openmp', when='+elpa+mpi+openmp') - depends_on('fftw+float', when='~openmp') - depends_on('fftw+float+openmp', when='+openmp') + depends_on('fftw precision=float') + depends_on('fftw~openmp', when='~openmp') + depends_on('fftw+openmp', when='+openmp') depends_on('netcdf-fortran', when='+hdf5') depends_on('hdf5+mpi', when='+mpi+hdf5') # required for NetCDF-4 support diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index bdc3f52f66..8c200b76f9 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -20,7 +20,7 @@ class Accfft(CMakePackage, CudaPackage): variant('shared', default=True, description='Enables the build of shared libraries') # See: http://accfft.org/articles/install/#installing-dependencies - depends_on('fftw+float+double~mpi+openmp') + depends_on('fftw precision=float,double ~mpi+openmp') depends_on('parallel-netcdf', when='+pnetcdf') diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index 3d1cd2eaf5..30bd081a63 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -28,7 +28,7 @@ class Libemos(CMakePackage): depends_on('eccodes', when='grib=eccodes') depends_on('grib-api', when='grib=grib-api') - depends_on('fftw+float+double') + depends_on('fftw precision=float,double') depends_on('cmake@2.8.11:', type='build') depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index c767baaaab..a9ab80b849 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -37,7 +37,7 @@ class Relion(CMakePackage, CudaPackage): # relion will not build with newer versions of cmake # per https://github.com/3dem/relion/issues/380 depends_on('cmake@3:3.9.4', type='build') - depends_on('fftw+float+double') + depends_on('fftw precision=float,double') depends_on('fltk', when='+gui') depends_on('libtiff') |