hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GDAL: fixed Java bindings, added v3.1.3 (#18494)

Browse source
This commit is contained in:
Adam J. Stewart 2020-09-10 08:08:24 -05:00 committed by GitHub
parent 778e659a03
commit 25291cf01c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
var/spack/repos/builtin/packages/gdal/package.py
View file

@ -3,9 +3,6 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
import sys
class Gdal(AutotoolsPackage):
"""GDAL (Geospatial Data Abstraction Library) is a translator library for
@ -18,7 +15,7 @@ class Gdal(AutotoolsPackage):
"""
homepage = "https://www.gdal.org/"
url = "https://download.osgeo.org/gdal/3.1.2/gdal-3.1.2.tar.xz"
url = "https://download.osgeo.org/gdal/3.1.3/gdal-3.1.3.tar.xz"
list_url = "https://download.osgeo.org/gdal/"
list_depth = 1
@ -29,6 +26,7 @@ class Gdal(AutotoolsPackage):
'osgeo.gdal_array', 'osgeo.gdalconst'
]
version('3.1.3', sha256='161cf55371a143826f1d76ce566db1f0a666496eeb4371aed78b1642f219d51d')
version('3.1.2', sha256='767c8d0dfa20ba3283de05d23a1d1c03a7e805d0ce2936beaff0bb7d11450641')
version('3.1.1', sha256='97154a606339a6c1d87c80fb354d7456fe49828b2ef9a3bc9ed91771a03d2a04')
version('3.1.0', sha256='e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda')
@ -91,6 +89,7 @@ class Gdal(AutotoolsPackage):
# FIXME: Allow packages to extend multiple packages
# See https://github.com/spack/spack/issues/987
# extends('jdk', when='+java')
# extends('perl', when='+perl')
extends('python', when='+python')
@ -149,7 +148,9 @@ 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', type=('build', 'link', 'run'), when='+java')
depends_on('java@4:8', type=('build', 'link', 'run'), when='+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')
depends_on('armadillo', when='+armadillo')
depends_on('cryptopp', when='+cryptopp @2.1:')
@ -178,6 +179,16 @@ def setup_build_environment(self, env):
env.set('PREFIX', self.prefix)
env.set('DESTDIR', '/')
def setup_run_environment(self, env):
if '+java' in self.spec:
class_paths = find(self.prefix, '*.jar')
classpath = os.pathsep.join(class_paths)
env.prepend_path('CLASSPATH', classpath)
def patch(self):
if '+java platform=darwin' in self.spec:
filter_file('linux', 'darwin', 'swig/java/java.opt', string=True)
# https://trac.osgeo.org/gdal/wiki/BuildHints
def configure_args(self):
spec = self.spec
@ -406,6 +417,7 @@ def configure_args(self):
args.append('--with-python=no')
# https://trac.osgeo.org/gdal/wiki/GdalOgrInJava
# https://trac.osgeo.org/gdal/wiki/GdalOgrInJavaBuildInstructionsUnix
if '+java' in spec:
args.extend([
'--with-java={0}'.format(spec['java'].home),
@ -498,6 +510,26 @@ def configure_args(self):
return args
# https://trac.osgeo.org/gdal/wiki/GdalOgrInJavaBuildInstructionsUnix
def build(self, spec, prefix):
make()
if '+java' in spec:
with working_dir('swig/java'):
make()
def check(self):
# no top-level test target
if '+java' in self.spec:
with working_dir('swig/java'):
make('test')
def install(self, spec, prefix):
make('install')
if '+java' in spec:
with working_dir('swig/java'):
make('install')
install('*.jar', prefix)
@run_after('install')
@on_package_attributes(run_tests=True)
def import_module_test(self):
@ -509,5 +541,5 @@ def import_module_test(self):
@run_after('install')
def darwin_fix(self):
# The shared library is not installed correctly on Darwin; fix this
if sys.platform == 'darwin':
if 'platform=darwin' in self.spec:
fix_darwin_install_name(self.prefix.lib)