From 0e2fa561f3a12dadabe192a3c07cfe934859c50b Mon Sep 17 00:00:00 2001 From: Scott McMillan Date: Wed, 20 Jan 2021 15:51:06 -0600 Subject: [PATCH] Perl: NVIDIA HPC SDK updates (#21177) * Perl: NVIDIA HPC SDK updates * fix indentation Co-authored-by: Scott McMillan --- .../builtin/packages/perl/{nvhpc.patch => nvhpc-5.30.patch} | 0 var/spack/repos/builtin/packages/perl/package.py | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename var/spack/repos/builtin/packages/perl/{nvhpc.patch => nvhpc-5.30.patch} (100%) diff --git a/var/spack/repos/builtin/packages/perl/nvhpc.patch b/var/spack/repos/builtin/packages/perl/nvhpc-5.30.patch similarity index 100% rename from var/spack/repos/builtin/packages/perl/nvhpc.patch rename to var/spack/repos/builtin/packages/perl/nvhpc-5.30.patch diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index f6bec31921..c3db09ac4f 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -77,7 +77,9 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package patch('macos-11-version-check.patch', when='@5.24.1:5.32.0 platform=darwin') # Enable builds with the NVIDIA compiler - patch('nvhpc.patch', when='%nvhpc') + patch('nvhpc-5.30.patch', when='@5.30.0:5.30.99 %nvhpc') + conflicts('@5.32.0:', when='%nvhpc', + msg='The NVIDIA compilers are incompatible with version 5.32 and later') # Installing cpanm alongside the core makes it safe and simple for # people/projects to install their own sets of perl modules. Not