From b109e16fba5d5d4ce5ad1ee2cc59d075bab082e9 Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Wed, 1 Mar 2023 00:18:00 +0300 Subject: Back-port a patch for filesystem logic in `gmx` executable. (#35672) * Backport a patch for relocatable `gmx` executable. * spack style fixes --- var/spack/repos/builtin/packages/gromacs/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'var') 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 \n#include ", "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) -- cgit v1.2.3-70-g09d2