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

magics fixes for versions > 2.29.x (#4302)

Browse source
This commit is contained in:
Michael Kuhn 2017-05-20 16:40:10 +02:00 committed by Adam J. Stewart
parent a32f8c33b0
commit c741cd900b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
var/spack/repos/builtin/packages/magics/package.py
View file

@ -42,7 +42,7 @@ class Magics(Package):
# The patch changes the hardcoded path to python in shebang to enable the # The patch changes the hardcoded path to python in shebang to enable the
# usage of the first python installation that appears in $PATH # usage of the first python installation that appears in $PATH
patch('no_hardcoded_python.patch') patch('no_hardcoded_python.patch', when='@:2.29.6')
# The patch reorders includes and adds namespaces where necessary to # The patch reorders includes and adds namespaces where necessary to
# resolve ambiguity of invocations of isnan and isinf functions. The # resolve ambiguity of invocations of isnan and isinf functions. The
@ -63,7 +63,8 @@ class Magics(Package):
depends_on('python', type='build') depends_on('python', type='build')
depends_on('perl', type='build') depends_on('perl', type='build')
depends_on('perl-xml-parser', type='build') depends_on('perl-xml-parser', type='build')
depends_on('grib-api') depends_on('eccodes', when='@2.30.0:')
depends_on('grib-api', when='@:2.29.6')
depends_on('proj') depends_on('proj')
depends_on('boost') depends_on('boost')
depends_on('expat') depends_on('expat')
@ -72,6 +73,7 @@ class Magics(Package):
depends_on('libemos', when='+bufr') depends_on('libemos', when='+bufr')
depends_on('qt', when='+metview+qt') depends_on('qt', when='+metview+qt')
@when('@:2.29.6')
def patch(self): def patch(self):
filter_file('#!/usr/bin/perl', '#!/usr/bin/env perl', filter_file('#!/usr/bin/perl', '#!/usr/bin/env perl',
'tools/xml2cc_new.pl') 'tools/xml2cc_new.pl')
@ -83,9 +85,13 @@ def install(self, spec, prefix):
options.append('-DENABLE_PYTHON=OFF') options.append('-DENABLE_PYTHON=OFF')
options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix)
options.append('-DPROJ4_PATH=%s' % spec['proj'].prefix) options.append('-DPROJ4_PATH=%s' % spec['proj'].prefix)
options.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix)
options.append('-DENABLE_TESTS=OFF') options.append('-DENABLE_TESTS=OFF')
if self.version >= Version('2.30.0'):
options.append('-DECCODES_PATH=%s' % spec['eccodes'].prefix)
else:
options.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix)
if '+bufr' in spec: if '+bufr' in spec:
options.append('-DENABLE_BUFR=ON') options.append('-DENABLE_BUFR=ON')
options.append('-DLIBEMOS_PATH=%s' % spec['libemos'].prefix) options.append('-DLIBEMOS_PATH=%s' % spec['libemos'].prefix)