From 0baba6290087efa02fffab40bc459278fdd8b296 Mon Sep 17 00:00:00 2001 From: Jen Herting Date: Mon, 12 Dec 2022 08:26:02 -0500 Subject: arrow: dependency fixes (#33666) +python needs more dependencies don't look for dependency spec when it's not there --- var/spack/repos/builtin/packages/arrow/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index c9bc1b7b66..55139e0b1e 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -47,11 +47,13 @@ class Arrow(CMakePackage, CudaPackage): depends_on("rapidjson") depends_on("re2+shared", when="+compute") depends_on("re2+shared", when="+gandiva") + depends_on("re2+shared", when="+python") depends_on("snappy~shared", when="+snappy @9:") depends_on("snappy~shared", when="@8:") depends_on("thrift+pic", when="+parquet") depends_on("utf8proc@2.7.0: +shared", when="+compute") depends_on("utf8proc@2.7.0: +shared", when="+gandiva") + depends_on("utf8proc@2.7.0: +shared", when="+python") depends_on("xsimd@8.1.0:", when="@9.0.0:") depends_on("zlib+pic", when="+zlib @9:") depends_on("zlib+pic", when="@:8") @@ -145,7 +147,12 @@ class Arrow(CMakePackage, CudaPackage): args.append(self.define_from_variant("ARROW_WITH_ZSTD", "zstd")) with when("@:8"): - for dep in ("flatbuffers", "rapidjson", "snappy", "zlib", "zstd"): + dep_list = ("flatbuffers", "rapidjson", "zlib", "zstd") + + if self.spec.satisfies("+snappy"): + dep_list.append("snappy") + + for dep in dep_list: args.append("-D{0}_HOME={1}".format(dep.upper(), self.spec[dep].prefix)) args.append("-DZLIB_LIBRARIES={0}".format(self.spec["zlib"].libs)) -- cgit v1.2.3-70-g09d2