diff options
| author | Thomas Madlener <thomas.madlener@desy.de> | 2023-04-26 07:57:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 22:57:19 -0700 |
| commit | eb4552542dbe32996a78402bfb001fa6f0e57480 (patch) | |
| tree | c6bb171c288ac6a62c89bfe8d09618f91679639d /var | |
| parent | b5f546b72b2bc77c798f52e2d6a5144bee6200cc (diff) | |
| download | spack-eb4552542dbe32996a78402bfb001fa6f0e57480.tar.gz spack-eb4552542dbe32996a78402bfb001fa6f0e57480.tar.bz2 spack-eb4552542dbe32996a78402bfb001fa6f0e57480.tar.xz spack-eb4552542dbe32996a78402bfb001fa6f0e57480.zip | |
elfutils package: fix +debuginfod installation issue (#36758)
* elfutils cannot build against libarchive@3.62+iconv
* elfutils needs libmicrohttpd version 0.9.50 or older
* elfutils: explicitly depend on pkg-config
* libmicrohttpd: Add several new versions
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/elfutils/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libmicrohttpd/package.py | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index db87d89bc9..53eab7b06e 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -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") @@ -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 diff --git a/var/spack/repos/builtin/packages/libmicrohttpd/package.py b/var/spack/repos/builtin/packages/libmicrohttpd/package.py index e1fbb9594d..0b657d51fa 100644 --- a/var/spack/repos/builtin/packages/libmicrohttpd/package.py +++ b/var/spack/repos/builtin/packages/libmicrohttpd/package.py @@ -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", sha256="e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182") version("0.9.70", sha256="90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307") + version("0.9.50", sha256="d1b6385068abded29b6470e383287aa7705de05ae3c08ad0bf5747ac4dc6ebd7") variant("https", default=False, description="HTTPS support with GnuTLS") |