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

ncl: add dependencies (#27394)

Browse Source 
- zstd
- makedepend
This commit is contained in:
Glenn Johnson 2021-11-15 04:23:50 -06:00 committed by GitHub
parent 557556bbfd
commit 19493e4932
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@ class Ncl(Package):
depends_on('flex+lex') depends_on('flex+lex')
depends_on('iconv') depends_on('iconv')
depends_on('tcsh') depends_on('tcsh')
depends_on('makedepend', type='build')
# Also, the manual says that ncl requires zlib, but that comes as a # Also, the manual says that ncl requires zlib, but that comes as a
# mandatory dependency of libpng, which is a mandatory dependency of cairo. # mandatory dependency of libpng, which is a mandatory dependency of cairo.
@ -71,6 +72,7 @@ class Ncl(Package):
depends_on('bzip2') depends_on('bzip2')
depends_on('freetype') depends_on('freetype')
depends_on('fontconfig') depends_on('fontconfig')
depends_on('zstd')
# In Spack, we do not have an option to compile netcdf-c without netcdf-4 # In Spack, we do not have an option to compile netcdf-c without netcdf-4
# support, so we will tell the ncl configuration script that we want # support, so we will tell the ncl configuration script that we want
@ -160,8 +162,8 @@ def prepare_site_config(self):
f.writelines([ f.writelines([
'#define HdfDefines\n', '#define HdfDefines\n',
'#define CppCommand \'/usr/bin/env cpp -traditional\'\n', '#define CppCommand \'/usr/bin/env cpp -traditional\'\n',
'#define CCompiler cc\n', '#define CCompiler {0}\n'.format(spack_cc),
'#define FCompiler fc\n', '#define FCompiler {0}\n'.format(spack_fc),
('#define CtoFLibraries ' + ' '.join(c2f_flags) + '\n' ('#define CtoFLibraries ' + ' '.join(c2f_flags) + '\n'
if len(c2f_flags) > 0 if len(c2f_flags) > 0
else ''), else ''),