zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arrow: dependency fixes (#33666)

Browse Source 
+python needs more dependencies
don't look for dependency spec when it's not there
This commit is contained in:
Jen Herting
2022-12-12 08:26:02 -05:00
committed by GitHub
parent 4a0e34eda8
commit 0baba62900
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/arrow/package.py
View File

@@ -47,11 +47,13 @@ class Arrow(CMakePackage, CudaPackage):
depends_on("rapidjson") depends_on("rapidjson")
depends_on("re2+shared", when="+compute") depends_on("re2+shared", when="+compute")
depends_on("re2+shared", when="+gandiva") depends_on("re2+shared", when="+gandiva")
depends_on("re2+shared", when="+python")
depends_on("snappy~shared", when="+snappy @9:") depends_on("snappy~shared", when="+snappy @9:")
depends_on("snappy~shared", when="@8:") depends_on("snappy~shared", when="@8:")
depends_on("thrift+pic", when="+parquet") depends_on("thrift+pic", when="+parquet")
depends_on("utf8proc@2.7.0: +shared", when="+compute") 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="+gandiva")
depends_on("utf8proc@2.7.0: +shared", when="+python")
depends_on("xsimd@8.1.0:", when="@9.0.0:") depends_on("xsimd@8.1.0:", when="@9.0.0:")
depends_on("zlib+pic", when="+zlib @9:") depends_on("zlib+pic", when="+zlib @9:")
depends_on("zlib+pic", when="@:8") depends_on("zlib+pic", when="@:8")
@@ -145,7 +147,12 @@ def cmake_args(self):
args.append(self.define_from_variant("ARROW_WITH_ZSTD", "zstd")) args.append(self.define_from_variant("ARROW_WITH_ZSTD", "zstd"))
with when("@:8"): 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("-D{0}_HOME={1}".format(dep.upper(), self.spec[dep].prefix))
args.append("-DZLIB_LIBRARIES={0}".format(self.spec["zlib"].libs)) args.append("-DZLIB_LIBRARIES={0}".format(self.spec["zlib"].libs))