diff options
author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2020-05-13 19:45:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-13 12:45:12 -0500 |
commit | a9ee4da67012344d6ab31db901556dbeb00b2b52 (patch) | |
tree | e3df7b6e7f21d9ad178b35888391b435b7fa9e8d /var | |
parent | 9b8082ecf3103d1393792f17565f10917457ac30 (diff) | |
download | spack-a9ee4da67012344d6ab31db901556dbeb00b2b52.tar.gz spack-a9ee4da67012344d6ab31db901556dbeb00b2b52.tar.bz2 spack-a9ee4da67012344d6ab31db901556dbeb00b2b52.tar.xz spack-a9ee4da67012344d6ab31db901556dbeb00b2b52.zip |
ncl: Fix build with gcc@10: (#16624)
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/ncl/package.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index e6e09faae1..4d9980ecc5 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -30,6 +30,9 @@ class Ncl(Package): patch('ymake-filter.patch', when="@6.4.0") # ymake additional local library and includes will be filtered improperly patch('ymake.patch', when="@6.4.0:") + # ncl does not build with gcc@10: + # https://github.com/NCAR/ncl/issues/123 + patch('https://src.fedoraproject.org/rpms/ncl/raw/12778c55142b5b1ccc26dfbd7857da37332940c2/f/ncl-boz.patch', when='%gcc@10:', sha256='64f3502c9deab48615a4cbc26073173081c0774faf75778b044d251e45d238f7') # This installation script is implemented according to this manual: # http://www.ncl.ucar.edu/Download/build_from_src.shtml @@ -144,6 +147,10 @@ class Ncl(Package): cc_flags.append('-fp-model precise') c2f_flags.extend(['-lifcore', '-lifport']) + if self.spec.satisfies('%gcc@10:'): + fc_flags.append('-fallow-argument-mismatch') + cc_flags.append('-fcommon') + with open('./config/Spack', 'w') as f: f.writelines([ '#define HdfDefines\n', |