summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorScott McMillan <scott.andrew.mcmillan@gmail.com>2021-01-20 15:51:06 -0600
committerGitHub <noreply@github.com>2021-01-20 15:51:06 -0600
commit0e2fa561f3a12dadabe192a3c07cfe934859c50b (patch)
tree20491d3c33d9b3c6a34dd0ba299f7e94095dd61f /var
parent7f86cc87b0cd3d96c5f6b518b7e13618c4db13fb (diff)
downloadspack-0e2fa561f3a12dadabe192a3c07cfe934859c50b.tar.gz
spack-0e2fa561f3a12dadabe192a3c07cfe934859c50b.tar.bz2
spack-0e2fa561f3a12dadabe192a3c07cfe934859c50b.tar.xz
spack-0e2fa561f3a12dadabe192a3c07cfe934859c50b.zip
Perl: NVIDIA HPC SDK updates (#21177)
* Perl: NVIDIA HPC SDK updates * fix indentation Co-authored-by: Scott McMillan <smcmillan@nvidia.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/perl/nvhpc-5.30.patch (renamed from var/spack/repos/builtin/packages/perl/nvhpc.patch)0
-rw-r--r--var/spack/repos/builtin/packages/perl/package.py4
2 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/perl/nvhpc.patch b/var/spack/repos/builtin/packages/perl/nvhpc-5.30.patch
index 5f3373bd1b..5f3373bd1b 100644
--- a/var/spack/repos/builtin/packages/perl/nvhpc.patch
+++ b/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