summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornkgh77 <84457720+nkgh77@users.noreply.github.com>2023-02-14 20:15:38 +0100
committerGitHub <noreply@github.com>2023-02-14 11:15:38 -0800
commit7aeee3339c25519d77858595d6cecbfcab6f7a75 (patch)
tree551ffc854db1ddead0f000324abf8a057ee084d7
parent38512d18e902ae9ca1dc2aaf8091e384e0fd824d (diff)
downloadspack-7aeee3339c25519d77858595d6cecbfcab6f7a75.tar.gz
spack-7aeee3339c25519d77858595d6cecbfcab6f7a75.tar.bz2
spack-7aeee3339c25519d77858595d6cecbfcab6f7a75.tar.xz
spack-7aeee3339c25519d77858595d6cecbfcab6f7a75.zip
fftw-api should be used for amdfftw and mkl (#35477)
fftw-api should be used instead of fftw because amdfftw and mkl can be linked.
-rw-r--r--var/spack/repos/builtin/packages/octave/package.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py
index 651c9215e3..617789e1dc 100644
--- a/var/spack/repos/builtin/packages/octave/package.py
+++ b/var/spack/repos/builtin/packages/octave/package.py
@@ -89,7 +89,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
# Optional dependencies
depends_on("arpack-ng", when="+arpack")
depends_on("curl", when="+curl")
- depends_on("fftw", when="+fftw")
+ depends_on("fftw-api@3", when="+fftw")
depends_on("fltk", when="+fltk")
depends_on("fontconfig", when="+fontconfig")
depends_on("freetype", when="+freetype")
@@ -222,12 +222,13 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
config_args.append("--without-curl")
if "+fftw" in spec:
+ fftw_string = "fftw-api"
config_args.extend(
[
- "--with-fftw3-includedir=%s" % spec["fftw"].prefix.include,
- "--with-fftw3-libdir=%s" % spec["fftw"].prefix.lib,
- "--with-fftw3f-includedir=%s" % spec["fftw"].prefix.include,
- "--with-fftw3f-libdir=%s" % spec["fftw"].prefix.lib,
+ "--with-fftw3-includedir=%s" % spec[fftw_string].prefix.include,
+ "--with-fftw3-libdir=%s" % spec[fftw_string].prefix.lib,
+ "--with-fftw3f-includedir=%s" % spec[fftw_string].prefix.include,
+ "--with-fftw3f-libdir=%s" % spec[fftw_string].prefix.lib,
]
)
else: