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

ncl: Fix build with gcc@10: (#16624)

Browse Source
This commit is contained in:
Michael Kuhn 2020-05-13 19:45:12 +02:00 committed by GitHub
parent 9b8082ecf3
commit a9ee4da670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,9 @@ class Ncl(Package):
patch('ymake-filter.patch', when="@6.4.0") patch('ymake-filter.patch', when="@6.4.0")
# ymake additional local library and includes will be filtered improperly # ymake additional local library and includes will be filtered improperly
patch('ymake.patch', when="@6.4.0:") 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: # This installation script is implemented according to this manual:
# http://www.ncl.ucar.edu/Download/build_from_src.shtml # http://www.ncl.ucar.edu/Download/build_from_src.shtml
@ -144,6 +147,10 @@ def prepare_site_config(self):
cc_flags.append('-fp-model precise') cc_flags.append('-fp-model precise')
c2f_flags.extend(['-lifcore', '-lifport']) 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: with open('./config/Spack', 'w') as f:
f.writelines([ f.writelines([
'#define HdfDefines\n', '#define HdfDefines\n',