From 937a4dbf696a6d3a82ddf1d7eebde3de68226c5d Mon Sep 17 00:00:00 2001 From: YI Zeping <18586016708@163.com> Date: Sat, 23 Mar 2024 19:41:34 +0800 Subject: NWChem pacakge: expand fftw patch appliance range to 7.2.2 (#43321) * expand fftw patch appliance range to include 7.2.2 * fix formatting bug --- var/spack/repos/builtin/packages/nwchem/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 4795a8e800..3e557c75a2 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -55,7 +55,7 @@ class Nwchem(Package): # https://github.com/nwchemgit/nwchem/commit/376f86f96eb982e83f10514e9dcd994564f973b4 # https://github.com/nwchemgit/nwchem/commit/c89fc9d1eca6689bce12564a63fdea95d962a123 # Prior versions of NWChem, including 7.0.2, were not able to link with FFTW - patch("fftw_splans.patch", when="@7.2.0 +fftw3") + patch("fftw_splans.patch", when="@7.2.0:7.2.2 +fftw3") depends_on("blas") depends_on("lapack") @@ -133,8 +133,8 @@ class Nwchem(Package): args.extend(["FFTW3_INCLUDE={0}".format(spec["fftw-api"].prefix.include)]) if spec.satisfies("+libxc"): - args.extend([f"LIBXC_LIB={0}".format(spec["libxc"].libs.ld_flags)]) - args.extend([f"LIBXC_INCLUDE={0}".format(spec["libxc"].prefix.include)]) + args.extend(["LIBXC_LIB={0}".format(spec["libxc"].libs.ld_flags)]) + args.extend(["LIBXC_INCLUDE={0}".format(spec["libxc"].prefix.include)]) if spec.satisfies("+elpa"): elpa = spec["elpa"] -- cgit v1.2.3-70-g09d2