diff options
| author | Elizabeth Fischer <rpf2116@columbia.edu> | 2018-05-03 23:55:31 -0400 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-03 22:55:31 -0500 |
| commit | 593ad23a9f4f51e3ff4231a894ba1998e212fdc4 (patch) | |
| tree | 0e5606ea70f1d2217b447411386328353e053694 | |
| parent | 0812fd1635911d3600e27dc9000ea1050516b125 (diff) | |
| download | spack-593ad23a9f4f51e3ff4231a894ba1998e212fdc4.tar.gz spack-593ad23a9f4f51e3ff4231a894ba1998e212fdc4.tar.bz2 spack-593ad23a9f4f51e3ff4231a894ba1998e212fdc4.tar.xz spack-593ad23a9f4f51e3ff4231a894ba1998e212fdc4.zip | |
gdal: update (#8008)
* gdal: update
* Remove unneeded depends(python)
| -rw-r--r-- | var/spack/repos/builtin/packages/gdal/package.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index b62ea01af1..3a22739a81 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -44,16 +44,17 @@ class Gdal(AutotoolsPackage): version('2.1.2', 'ae85b78888514c75e813d658cac9478e') version('2.0.2', '940208e737c87d31a90eaae43d0efd65') - extends('python') + extends('python', when='+python') variant('hdf5', default=False, description='Enable HDF5 support') variant('hdf', default=False, description='Enable HDF4 support') variant('openjpeg', default=False, description='Enable JPEG2000 support') variant('geos', default=False, description='Enable GEOS support') variant('kea', default=False, description='Enable KEA support') - variant('netcdf', default=False, description='Enable netcdf support') + variant('netcdf', default=False, description='Enable NetCDF support') + variant('python', default=False, description='Enable Python support') - depends_on('swig') + depends_on('swig', when='+python') depends_on("hdf5", when='+hdf5') depends_on("hdf", when='+hdf') depends_on("openjpeg", when='+openjpeg') @@ -74,9 +75,13 @@ class Gdal(AutotoolsPackage): args = [] args.append("--with-liblzma=yes") args.append("--with-zlib=%s" % spec['zlib'].prefix) - args.append("--with-python=%s" % spec['python'].command.path) args.append("--without-libtool") + if '+python' in spec: + args.append("--with-python=%s" % spec['python'].command.path) + else: + args.append("--with-python=no") + if '+geos' in spec: args.append('--with-geos=yes') if '+hdf' in spec: |