zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ncl: Fix build (#11855)

Browse Source 
ncl does not build with newer versions of gdal (or rather proj). This
also needs a small change to gdal, otherwise we end up with both proj@5
and proj@6 in the spec.
This commit is contained in:
Michael Kuhn 2019-06-27 02:36:29 +02:00 committed by Adam J. Stewart
parent a0f2d6a8b9
commit 0ef3b4c578
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/gdal/package.py
View File

@ -91,6 +91,7 @@ class Gdal(AutotoolsPackage):
# Required dependencies
depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite
depends_on('libgeotiff@1.2.1:')
depends_on('libgeotiff@:1.4', when='@:2.4')
depends_on('libgeotiff@1.5:', when='@3:')
depends_on('json-c', when='@2.3:')
depends_on('json-c@0.12.1', when='@:2.2')

2
var/spack/repos/builtin/packages/ncl/package.py
View File

@ -76,7 +76,7 @@ class Ncl(Package):
# Some of the optional dependencies according to the manual:
depends_on('hdf', when='+hdf4')
depends_on('gdal', when='+gdal')
depends_on('gdal+proj@:2.4', when='+gdal')
depends_on('udunits2', when='+udunits2')
# We need src files of triangle to appear in ncl's src tree if we want