diff options
| author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2019-06-27 02:36:29 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-06-26 19:36:29 -0500 |
| commit | 0ef3b4c578cb1f118445546fcca253059ce1fa5c (patch) | |
| tree | 9aa0c505a1511cf9b40958ace146ed7ef2e0db0d /var | |
| parent | a0f2d6a8b920887adc4528f37ed83ab6d49d08a7 (diff) | |
| download | spack-0ef3b4c578cb1f118445546fcca253059ce1fa5c.tar.gz spack-0ef3b4c578cb1f118445546fcca253059ce1fa5c.tar.bz2 spack-0ef3b4c578cb1f118445546fcca253059ce1fa5c.tar.xz spack-0ef3b4c578cb1f118445546fcca253059ce1fa5c.zip | |
ncl: Fix build (#11855)
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.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gdal/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ncl/package.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 0f8427ec7c..3332b176ea 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -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') diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 4614c65d10..aa4499c1c6 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -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 |