From 602984460d8a6c189fa9127e9268707dfe4dff86 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 19 Nov 2022 12:07:52 +0100 Subject: Boost: enable lzma and zstd iostreams (#33998) --- var/spack/repos/builtin/packages/boost/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 3fd01f2384..03950786b4 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -225,6 +225,8 @@ class Boost(Package): depends_on("mpi", when="+mpi") depends_on("bzip2", when="+iostreams") depends_on("zlib", when="+iostreams") + depends_on("zstd", when="+iostreams") + depends_on("xz", when="+iostreams") depends_on("py-numpy", when="+numpy", type=("build", "run")) # Improve the error message when the context-impl variant is conflicting @@ -513,9 +515,13 @@ class Boost(Package): "-s", "ZLIB_LIBPATH=%s" % spec["zlib"].prefix.lib, "-s", - "NO_LZMA=1", + "LZMA_INCLUDE=%s" % spec["xz"].prefix.include, "-s", - "NO_ZSTD=1", + "LZMA_LIBPATH=%s" % spec["xz"].prefix.lib, + "-s", + "ZSTD_INCLUDE=%s" % spec["zstd"].prefix.include, + "-s", + "ZSTD_LIBPATH=%s" % spec["zstd"].prefix.lib, ] ) -- cgit v1.2.3-70-g09d2