gdal: update (#8008)

* gdal: update

* Remove unneeded depends(python)
This commit is contained in:
Elizabeth Fischer 2018-05-03 23:55:31 -04:00 committed by Adam J. Stewart
parent 0812fd1635
commit 593ad23a9f

View File

@ -44,16 +44,17 @@ class Gdal(AutotoolsPackage):
version('2.1.2', 'ae85b78888514c75e813d658cac9478e') version('2.1.2', 'ae85b78888514c75e813d658cac9478e')
version('2.0.2', '940208e737c87d31a90eaae43d0efd65') version('2.0.2', '940208e737c87d31a90eaae43d0efd65')
extends('python') extends('python', when='+python')
variant('hdf5', default=False, description='Enable HDF5 support') variant('hdf5', default=False, description='Enable HDF5 support')
variant('hdf', default=False, description='Enable HDF4 support') variant('hdf', default=False, description='Enable HDF4 support')
variant('openjpeg', default=False, description='Enable JPEG2000 support') variant('openjpeg', default=False, description='Enable JPEG2000 support')
variant('geos', default=False, description='Enable GEOS support') variant('geos', default=False, description='Enable GEOS support')
variant('kea', default=False, description='Enable KEA 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("hdf5", when='+hdf5')
depends_on("hdf", when='+hdf') depends_on("hdf", when='+hdf')
depends_on("openjpeg", when='+openjpeg') depends_on("openjpeg", when='+openjpeg')
@ -74,9 +75,13 @@ def configure_args(self):
args = [] args = []
args.append("--with-liblzma=yes") args.append("--with-liblzma=yes")
args.append("--with-zlib=%s" % spec['zlib'].prefix) args.append("--with-zlib=%s" % spec['zlib'].prefix)
args.append("--with-python=%s" % spec['python'].command.path)
args.append("--without-libtool") 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: if '+geos' in spec:
args.append('--with-geos=yes') args.append('--with-geos=yes')
if '+hdf' in spec: if '+hdf' in spec: