diff options
author | M. Eric Irrgang <ericirrgang@gmail.com> | 2023-03-01 00:18:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-28 14:18:00 -0700 |
commit | b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9 (patch) | |
tree | cb58ce1285cc380f0b5c7950f23e041ae56fde67 | |
parent | 043a80ff9ecabe8ce007b131823392c016ee00f8 (diff) | |
download | spack-b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9.tar.gz spack-b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9.tar.bz2 spack-b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9.tar.xz spack-b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9.zip |
Back-port a patch for filesystem logic in `gmx` executable. (#35672)
* Backport a patch for relocatable `gmx` executable.
* spack style fixes
-rw-r--r-- | var/spack/repos/builtin/packages/gromacs/package.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 7f8309c851..7804b7ef20 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -273,6 +273,15 @@ class Gromacs(CMakePackage): "#include <queue>\n#include <limits>", "src/gromacs/modularsimulator/modularsimulator.h", ) + # Ref: https://gitlab.com/gromacs/gromacs/-/merge_requests/3504 + if self.spec.satisfies("@2023"): + filter_file( + " if (std::filesystem::equivalent(searchPath, buildBinPath))", + " if (std::error_code c; std::filesystem::equivalent(searchPath," + " buildBinPath, c))", + "src/gromacs/commandline/cmdlineprogramcontext.cpp", + string=True, + ) if "+plumed" in self.spec: self.spec["plumed"].package.apply_patch(self) |