From 5e96f155c88b738bece43585c2bfa19b5fd267a9 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 17 Mar 2026 13:49:37 +0000 Subject: [PATCH] dev-libs/elfutils: don't enable debuginfod for multilib I can't see value in this, it would mean a 32-bit application or library linked against elfutils needed to use the debuginfod APIs. We can restore it on request but the state before this change means many users have to add p.use ABI_X86_32 entries. Signed-off-by: Sam James --- .../{elfutils-0.193-r1.ebuild => elfutils-0.193-r2.ebuild} | 6 +++--- .../{elfutils-0.194.ebuild => elfutils-0.194-r1.ebuild} | 6 +++--- dev-libs/elfutils/elfutils-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename dev-libs/elfutils/{elfutils-0.193-r1.ebuild => elfutils-0.193-r2.ebuild} (96%) rename dev-libs/elfutils/{elfutils-0.194.ebuild => elfutils-0.194-r1.ebuild} (96%) diff --git a/dev-libs/elfutils/elfutils-0.193-r1.ebuild b/dev-libs/elfutils/elfutils-0.193-r2.ebuild similarity index 96% rename from dev-libs/elfutils/elfutils-0.193-r1.ebuild rename to dev-libs/elfutils/elfutils-0.193-r2.ebuild index 6b7ee7cfe364f..b00932a94af66 100644 --- a/dev-libs/elfutils/elfutils-0.193-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.193-r2.ebuild @@ -38,9 +38,9 @@ RDEPEND=" bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( dev-db/sqlite:3= - >=dev-libs/json-c-0.11:=[${MULTILIB_USEDEP}] + >=dev-libs/json-c-0.11:= >=net-libs/libmicrohttpd-0.9.33:= - >=net-misc/curl-7.29.0[static-libs?,${MULTILIB_USEDEP}] + >=net-misc/curl-7.29.0[static-libs?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) stacktrace? ( dev-util/sysprof ) @@ -107,7 +107,7 @@ multilib_src_configure() { $(use_enable nls) $(multilib_native_use_enable debuginfod) # Could do dummy if needed? - $(use_enable debuginfod libdebuginfod) + $(multilib_native_use_enable debuginfod libdebuginfod) $(multilib_native_use_enable stacktrace) $(use_enable valgrind valgrind-annotations) diff --git a/dev-libs/elfutils/elfutils-0.194.ebuild b/dev-libs/elfutils/elfutils-0.194-r1.ebuild similarity index 96% rename from dev-libs/elfutils/elfutils-0.194.ebuild rename to dev-libs/elfutils/elfutils-0.194-r1.ebuild index dcb73bf5449a3..4a59c0e8a473a 100644 --- a/dev-libs/elfutils/elfutils-0.194.ebuild +++ b/dev-libs/elfutils/elfutils-0.194-r1.ebuild @@ -38,9 +38,9 @@ RDEPEND=" bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( dev-db/sqlite:3= - >=dev-libs/json-c-0.11:=[${MULTILIB_USEDEP}] + >=dev-libs/json-c-0.11:= >=net-libs/libmicrohttpd-0.9.33:= - >=net-misc/curl-7.29.0[static-libs?,${MULTILIB_USEDEP}] + >=net-misc/curl-7.29.0[static-libs?] ) libarchive? ( >=app-arch/libarchive-3.1.2:= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) @@ -111,7 +111,7 @@ multilib_src_configure() { $(multilib_native_use_enable debuginfod) # Could do dummy if needed? We could also split libdebuginfod # (client support) into its own USE if required. - $(use_enable debuginfod libdebuginfod) + $(multilib_native_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 0a0a771b81b2a..0b3a2cebcbc32 100644 --- a/dev-libs/elfutils/elfutils-9999.ebuild +++ b/dev-libs/elfutils/elfutils-9999.ebuild @@ -38,9 +38,9 @@ RDEPEND=" bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( dev-db/sqlite:3= - >=dev-libs/json-c-0.11:=[${MULTILIB_USEDEP}] + >=dev-libs/json-c-0.11:= >=net-libs/libmicrohttpd-0.9.33:= - >=net-misc/curl-7.29.0[static-libs?,${MULTILIB_USEDEP}] + >=net-misc/curl-7.29.0[static-libs?] ) libarchive? ( >=app-arch/libarchive-3.1.2:= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) @@ -110,7 +110,7 @@ multilib_src_configure() { $(multilib_native_use_enable debuginfod) # Could do dummy if needed? We could also split libdebuginfod # (client support) into its own USE if required. - $(use_enable debuginfod libdebuginfod) + $(multilib_native_use_enable debuginfod libdebuginfod) $(multilib_native_use_enable stacktrace) $(use_enable valgrind valgrind-annotations)