From d284ea39a1cfebe901bddee9258b5404ace18576 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 9 May 2019 19:33:36 +0200 Subject: [PATCH] nco: Add 4.7.9 (#11389) Earlier versions do not compile with gcc@9. --- var/spack/repos/builtin/packages/nco/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index 0374f99d62..4ab74fd19f 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -13,6 +13,7 @@ class Nco(AutotoolsPackage): homepage = "http://nco.sourceforge.net/" url = "https://github.com/nco/nco/archive/4.6.7.tar.gz" + version('4.7.9', '048f6298bceb40913c3ae433f875dea1e9129b1c86019128e7271d08f274a879') version('4.6.7', 'b04c92aa715d3fad3ebebd1fd178ce32') version('4.6.6', 'df6fa47aaf6e41adfc0631912a7a341f') version('4.6.5', '2afd34a6bb5ff6c7ed39cf40c917b6e4') @@ -23,7 +24,7 @@ class Nco(AutotoolsPackage): version('4.5.5', '9f1f1cb149ad6407c5a03c20122223ce') # https://github.com/nco/nco/issues/43 - patch('NUL-0-NULL.patch') + patch('NUL-0-NULL.patch', when='@:4.6.7') variant('doc', default=False, description='Build/install NCO TexInfo-based documentation') @@ -38,6 +39,8 @@ class Nco(AutotoolsPackage): depends_on('bison', type='build') depends_on('texinfo@4.12:', type='build', when='+doc') + conflicts('%gcc@9:', when='@:4.7.8') + def configure_args(self): spec = self.spec return ['--{0}-doc'.format('enable' if '+doc' in spec else 'disable')]