diff options
| author | Thomas Bouvier <contact@thomas-bouvier.io> | 2023-01-22 09:05:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 09:05:37 +0100 |
| commit | b7a68938c2c71390c4d9b2b7ec326f5b3739e18c (patch) | |
| tree | 418f42a8ad4079316050ab0547f7c3b3ac6e0eea | |
| parent | ce8727cece0c25374b5629a928b0e8a1806e17d5 (diff) | |
| download | spack-b7a68938c2c71390c4d9b2b7ec326f5b3739e18c.tar.gz spack-b7a68938c2c71390c4d9b2b7ec326f5b3739e18c.tar.bz2 spack-b7a68938c2c71390c4d9b2b7ec326f5b3739e18c.tar.xz spack-b7a68938c2c71390c4d9b2b7ec326f5b3739e18c.zip | |
`arrow`: don't use `when` as a keyword argument to filter_file() (#35065)
Co-authored-by: thomas-bouvier <thomas-bouvier@users.noreply.github.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/arrow/package.py | 26 |
1 files changed, 13 insertions, 13 deletions
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 <llvm/Support/DynamicLibrary\.h>", - r"#include <llvm/Support/DynamicLibrary.h>" + "\n" + r"#include <llvm/Support/Host.h>", - "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 <llvm/Support/DynamicLibrary\.h>", + r"#include <llvm/Support/DynamicLibrary.h>" + + "\n" + + r"#include <llvm/Support/Host.h>", + "cpp/src/gandiva/engine.cc", + ) def cmake_args(self): args = ["-DARROW_DEPENDENCY_SOURCE=SYSTEM", "-DARROW_NO_DEPRECATED_API=ON"] |