hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

elfutils: unconditionally depend on zstd (#37368)

Browse source
This commit is contained in:
Harmen Stoppels 2023-05-05 10:40:14 +02:00 committed by GitHub
parent b2c3973d4a
commit 3ecb84d398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
var/spack/repos/builtin/packages/elfutils/package.py
View file

@ -46,11 +46,6 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
version("0.168", sha256="b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276")
version("0.163", sha256="7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23")
# Libraries for reading compressed DWARF sections.
variant("bzip2", default=False, description="Support bzip2 compressed sections.")
variant("xz", default=False, description="Support xz (lzma) compressed sections.")
variant("zstd", default=False, description="Support zstd compressed sections.", when="@0.182:")
# Native language support from libintl.
variant("nls", default=True, description="Enable Native Language Support.")
@ -68,10 +63,11 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
sha256="d786d49c28d7f0c8fc27bab39ca8714e5f4d128c7f09bb18533a8ec99b38dbf8",
)
depends_on("bzip2", type="link", when="+bzip2")
depends_on("xz", type="link", when="+xz")
depends_on("zstd", type="link", when="+zstd")
depends_on("bzip2", type="link")
depends_on("xz", type="link")
depends_on("zlib", type="link")
depends_on("zstd", type="link", when="@0.182:")
depends_on("gettext", when="+nls")
depends_on("m4", type="build")
depends_on("pkgconfig@0.9.0:", type=("build", "link"))
@ -115,22 +111,14 @@ def flag_handler(self, name, flags):
def configure_args(self):
spec = self.spec
args = []
args = [
"--with-bzlib=%s" % spec["bzip2"].prefix,
"--with-lzma=%s" % spec["xz"].prefix,
"--with-zlib=%s" % spec["zlib"].prefix,
]
if "+bzip2" in spec:
args.append("--with-bzlib=%s" % spec["bzip2"].prefix)
else:
args.append("--without-bzlib")
if "+xz" in spec:
args.append("--with-lzma=%s" % spec["xz"].prefix)
else:
args.append("--without-lzma")
args.extend(self.with_or_without("zstd", activation_value="prefix"))
# zlib is required
args.append("--with-zlib=%s" % spec["zlib"].prefix)
if "@0.182:" in spec:
args.append("--with-zstd=%s" % spec["zstd"].prefix)
if spec.satisfies("@0.183:"):
if spec["iconv"].name == "libc":

2
var/spack/repos/builtin/packages/hpctoolkit/package.py
View file

@ -120,7 +120,7 @@ class Hpctoolkit(AutotoolsPackage):
depends_on("dyninst@12.1.0:", when="@2022.0:")
depends_on("dyninst@10.2.0:", when="@2021.0:2021.12")
depends_on("dyninst@9.3.2:", when="@:2020")
depends_on("elfutils+bzip2+xz~nls", type="link")
depends_on("elfutils~nls", type="link")
depends_on("gotcha@1.0.3:", when="@:2020.09")
depends_on("intel-tbb+shared")
depends_on("libdwarf", when="@:2022.06")