Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix elfutils +debuginfod installation issue #36758

Merged
merged 7 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions var/spack/repos/builtin/packages/elfutils/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
depends_on("zlib", type="link")
depends_on("gettext", when="+nls")
depends_on("m4", type="build")
depends_on("pkgconfig@0.9.0:", type=("build", "link"))

# debuginfod has extra dependencies
# NB: Waiting on an elfutils patch before we can use libmicrohttpd@0.9.71
depends_on("libmicrohttpd@0.9.33:0.9.70", type="link", when="+debuginfod")
# NB: Waiting on an elfutils patch before we can use libmicrohttpd@0.9.51
depends_on("libmicrohttpd@0.9.33:0.9.50", type="link", when="+debuginfod")
depends_on("libarchive@3.1.2:", type="link", when="+debuginfod")
depends_on("sqlite@3.7.17:", type="link", when="+debuginfod")
depends_on("curl@7.29.0:", type="link", when="+debuginfod")
Expand All @@ -85,6 +86,11 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):

provides("elf@1")

# libarchive with iconv doesn't configure.
# see https://github.com/spack/spack/issues/36710
# and https://github.com/libarchive/libarchive/issues/1819
conflicts("^libarchive@3.6.2 +iconv", when="+debuginfod")

# Elfutils uses nested functions in C code, which is implemented
# in gcc, but not in clang. C code compiled with gcc is
# binary-compatible with clang, so it should be possible to build
Expand Down
6 changes: 6 additions & 0 deletions var/spack/repos/builtin/packages/libmicrohttpd/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ class Libmicrohttpd(AutotoolsPackage):

maintainers("hainest")

version("0.9.76", sha256="f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c")
version("0.9.75", sha256="9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb")
version("0.9.74", sha256="42035d0261373324bfb434018f4ab892514b10253d1af232e41b4cc2c11e650b")
version("0.9.73", sha256="a37b2f1b88fd1bfe74109586be463a434d34e773530fc2a74364cfcf734c032e")
version("0.9.72", sha256="0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8")
version("0.9.71", "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182")
version("0.9.70", "90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307")
version("0.9.50", sha256="d1b6385068abded29b6470e383287aa7705de05ae3c08ad0bf5747ac4dc6ebd7")

variant("https", default=False, description="HTTPS support with GnuTLS")

Expand Down