diff options
| author | AMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com> | 2023-09-19 07:52:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 08:52:15 +0200 |
| commit | a0dcf9620be2006af4c9f7bd0f8c29cdf35573c4 (patch) | |
| tree | 366f770fbb6662066e54ee049bb5354ed087106c /var | |
| parent | 9a9c3a984b84faac460bc467abcc03dfe2324afd (diff) | |
| download | spack-a0dcf9620be2006af4c9f7bd0f8c29cdf35573c4.tar.gz spack-a0dcf9620be2006af4c9f7bd0f8c29cdf35573c4.tar.bz2 spack-a0dcf9620be2006af4c9f7bd0f8c29cdf35573c4.tar.xz spack-a0dcf9620be2006af4c9f7bd0f8c29cdf35573c4.zip | |
Lammps: don't apply AOCC patches to versions containing the backport (#39844)
Co-authored-by: Phil Tooley <phil.tooley@amd.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/lammps/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 31407233ae..a44c7bd603 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -693,7 +693,12 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage): patch("lib.patch", when="@20170901") patch("660.patch", when="@20170922") patch("gtest_fix.patch", when="@:20210310 %aocc@3.2.0") - patch("intel-aocc.patch", when="@20220324:20221103 +intel %aocc") + + # This patch merged to LAMMPS trunk at 20221222 and backported to + # stable version 20220623.4. We still patch all other affected + # versions here + patch("intel-aocc.patch", when="@20220324:20220623.3,20220803:20221103 +intel %aocc") + patch( "https://github.com/lammps/lammps/commit/562300996285fdec4ef74542383276898555af06.patch?full_index=1", sha256="e6f1b62bbfdc79d632f4cea98019202d0dd25aa4ae61a70df1164cb4f290df79", |