From b7a68938c2c71390c4d9b2b7ec326f5b3739e18c Mon Sep 17 00:00:00 2001 From: Thomas Bouvier Date: Sun, 22 Jan 2023 09:05:37 +0100 Subject: `arrow`: don't use `when` as a keyword argument to filter_file() (#35065) Co-authored-by: thomas-bouvier --- var/spack/repos/builtin/packages/arrow/package.py | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index c1b05ba8bc..b40b86a120 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -101,19 +101,19 @@ class Arrow(CMakePackage, CudaPackage): r"(include_directories\()SYSTEM ", r"\1", "cpp/cmake_modules/ThirdpartyToolchain.cmake" ) - filter_file( - r'set\(ARROW_LLVM_VERSIONS "10" "9" "8" "7"\)', - 'set(ARROW_LLVM_VERSIONS "11" "10" "9" "8" "7")', - "cpp/CMakeLists.txt", - when="@:2.0.0", - ) - - filter_file( - r"#include ", - r"#include " + "\n" + r"#include ", - "cpp/src/gandiva/engine.cc", - when="@2.0.0", - ) + if self.spec.satisfies("@:2.0.0"): + filter_file( + r'set\(ARROW_LLVM_VERSIONS "10" "9" "8" "7"\)', + 'set(ARROW_LLVM_VERSIONS "11" "10" "9" "8" "7")', + "cpp/CMakeLists.txt", + ) + filter_file( + r"#include ", + r"#include " + + "\n" + + r"#include ", + "cpp/src/gandiva/engine.cc", + ) def cmake_args(self): args = ["-DARROW_DEPENDENCY_SOURCE=SYSTEM", "-DARROW_NO_DEPRECATED_API=ON"] -- cgit v1.2.3-60-g2f50