summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2021-09-25 01:01:45 -0500
committerGitHub <noreply@github.com>2021-09-25 00:01:45 -0600
commitb8e21f2b0b1d37a1bffaca0db3f6a7dbe242f02d (patch)
tree3310ddbe5eb277f5039fcd80d4fa54989deb5a5c /var
parent7e67652983e2574885e1f91aaf71ed279ab77b79 (diff)
downloadspack-b8e21f2b0b1d37a1bffaca0db3f6a7dbe242f02d.tar.gz
spack-b8e21f2b0b1d37a1bffaca0db3f6a7dbe242f02d.tar.bz2
spack-b8e21f2b0b1d37a1bffaca0db3f6a7dbe242f02d.tar.xz
spack-b8e21f2b0b1d37a1bffaca0db3f6a7dbe242f02d.zip
GDAL: fix build of Java bindings (#26244)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gdal/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py
index 5548b1e584..a1cf3c389f 100644
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -158,7 +158,10 @@ class Gdal(AutotoolsPackage):
# swig/python/setup.py
depends_on('py-setuptools', type='build', when='+python')
depends_on('py-numpy@1.0.0:', type=('build', 'run'), when='+python')
- depends_on('java@4:8', type=('build', 'link', 'run'), when='+java')
+ depends_on('java@7:', type=('build', 'link', 'run'), when='@3.2:+java')
+ depends_on('java@6:', type=('build', 'link', 'run'), when='@2.4:+java')
+ depends_on('java@5:', type=('build', 'link', 'run'), when='@2.1:+java')
+ depends_on('java@4:', type=('build', 'link', 'run'), when='@:2.0+java')
depends_on('ant', type='build', when='+java')
depends_on('swig', type='build', when='+java')
depends_on('jackcess@1.2.0:1.2.999', type='run', when='+mdb')
@@ -562,7 +565,6 @@ class Gdal(AutotoolsPackage):
if spec.satisfies('@2.1:'):
args.extend([
'--with-mongocxx=no',
- '--with-gnm=no',
'--with-pdfium=no',
])