From 19493e49327e1da72ebca5202c42b69faf06b63d Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Mon, 15 Nov 2021 04:23:50 -0600 Subject: ncl: add dependencies (#27394) - zstd - makedepend --- var/spack/repos/builtin/packages/ncl/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index a4bd503d07..c4d7659cd4 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -56,6 +56,7 @@ class Ncl(Package): depends_on('flex+lex') depends_on('iconv') depends_on('tcsh') + depends_on('makedepend', type='build') # Also, the manual says that ncl requires zlib, but that comes as a # mandatory dependency of libpng, which is a mandatory dependency of cairo. @@ -71,6 +72,7 @@ class Ncl(Package): depends_on('bzip2') depends_on('freetype') depends_on('fontconfig') + depends_on('zstd') # 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 @@ -160,8 +162,8 @@ class Ncl(Package): f.writelines([ '#define HdfDefines\n', '#define CppCommand \'/usr/bin/env cpp -traditional\'\n', - '#define CCompiler cc\n', - '#define FCompiler fc\n', + '#define CCompiler {0}\n'.format(spack_cc), + '#define FCompiler {0}\n'.format(spack_fc), ('#define CtoFLibraries ' + ' '.join(c2f_flags) + '\n' if len(c2f_flags) > 0 else ''), -- cgit v1.2.3-60-g2f50