commit: c12d1f7e3a42c4af5535536ca43397a5b801a354 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 31 03:26:49 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 31 03:27:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12d1f7e
dev-libs/elfutils: fix dependencies for libdebuginfod * Add dependency on json-c (multilib because it's for libdebuginfod, not just the daemon) * Add minimum dep versions for the other debuginfod deps as it makes it easier to compare with the build system then. Closes: https://bugs.gentoo.org/942508 Signed-off-by: Sam James <sam <AT> gentoo.org> .../elfutils/{elfutils-0.192.ebuild => elfutils-0.192-r1.ebuild} | 9 +++++---- dev-libs/elfutils/elfutils-9999.ebuild | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dev-libs/elfutils/elfutils-0.192.ebuild b/dev-libs/elfutils/elfutils-0.192-r1.ebuild similarity index 94% rename from dev-libs/elfutils/elfutils-0.192.ebuild rename to dev-libs/elfutils/elfutils-0.192-r1.ebuild index 36c17b46d209..66caa21ab476 100644 --- a/dev-libs/elfutils/elfutils-0.192.ebuild +++ b/dev-libs/elfutils/elfutils-0.192-r1.ebuild @@ -36,11 +36,11 @@ RDEPEND=" >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( - app-arch/libarchive:= + >=app-arch/libarchive-3.1.2:= dev-db/sqlite:3= - net-libs/libmicrohttpd:= - - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/json-c-0.11:=[${MULTILIB_USEDEP}] + >=net-libs/libmicrohttpd-0.9.33:= + >=net-misc/curl-7.29.0[static-libs?,${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) stacktrace? ( dev-util/sysprof ) @@ -99,6 +99,7 @@ multilib_src_configure() { local myeconfargs=( $(use_enable nls) $(multilib_native_use_enable debuginfod) + # Could do dummy if needed? $(use_enable debuginfod libdebuginfod) $(multilib_native_use_enable stacktrace) $(use_enable valgrind valgrind-annotations) diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild index 84b6120da8b2..be39e698ca36 100644 --- a/dev-libs/elfutils/elfutils-9999.ebuild +++ b/dev-libs/elfutils/elfutils-9999.ebuild @@ -36,11 +36,11 @@ RDEPEND=" >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( - app-arch/libarchive:= + >=app-arch/libarchive-3.1.2:= dev-db/sqlite:3= - net-libs/libmicrohttpd:= - - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/json-c-0.11:=[${MULTILIB_USEDEP}] + >=net-libs/libmicrohttpd-0.9.33:= + >=net-misc/curl-7.29.0[static-libs?,${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) stacktrace? ( dev-util/sysprof )
