diff options
| author | Scott McMillan <scott.andrew.mcmillan@gmail.com> | 2020-11-02 10:12:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 10:12:15 -0600 |
| commit | f621e97f473b7a55dac140e6aa76201f00f9b077 (patch) | |
| tree | bd0aa23c6c79c5016f3b0dbbded8a4b34adbe5fc | |
| parent | acc075d79d009bfa1e9b1a67a4a559c9fa9772e3 (diff) | |
| download | spack-f621e97f473b7a55dac140e6aa76201f00f9b077.tar.gz spack-f621e97f473b7a55dac140e6aa76201f00f9b077.tar.bz2 spack-f621e97f473b7a55dac140e6aa76201f00f9b077.tar.xz spack-f621e97f473b7a55dac140e6aa76201f00f9b077.zip | |
Fix issue with NAMD patch not applying cleanly (#19675)
Co-authored-by: Scott McMillan <smcmillan@nvidia.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/namd/inherited-member-2.13.patch (renamed from var/spack/repos/builtin/packages/namd/inherited-member.patch) | 0 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/namd/package.py | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/namd/inherited-member.patch b/var/spack/repos/builtin/packages/namd/inherited-member-2.13.patch index 88d45d61e7..88d45d61e7 100644 --- a/var/spack/repos/builtin/packages/namd/inherited-member.patch +++ b/var/spack/repos/builtin/packages/namd/inherited-member-2.13.patch diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index f7cccc2b59..1da71d20f5 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -35,8 +35,8 @@ class Namd(MakefilePackage): # init_tcl_pointers() declaration and implementation are inconsistent # "src/colvarproxy_namd.C", line 482: error: inherited member is not # allowed - patch('inherited-member.patch', when='@:2.13') - patch('inherited-member-2.14.patch', when='@2.14:') + patch('inherited-member-2.13.patch', when='@2.13') + patch('inherited-member-2.14.patch', when='@2.14') depends_on('charmpp@6.10.1:', when="@2.14:") depends_on('charmpp@6.8.2', when="@2.13") |