commit:     654eec8416cc077d2a32f0a20b9ff5d201e4a74d
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 00:28:34 2023 +0000
Commit:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 21:44:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654eec84

sys-devel/binutils: add debuginfod support

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>

 .../{binutils-9999.ebuild => binutils-2.40-r6.ebuild}         | 11 ++++++-----
 sys-devel/binutils/binutils-9999.ebuild                       |  9 +++++----
 sys-devel/binutils/metadata.xml                               |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sys-devel/binutils/binutils-9999.ebuild 
b/sys-devel/binutils/binutils-2.40-r6.ebuild
similarity index 98%
copy from sys-devel/binutils/binutils-9999.ebuild
copy to sys-devel/binutils/binutils-2.40-r6.ebuild
index d8c2553ece20..ff5ebb262fb2 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-2.40-r6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/";
 
 LICENSE="GPL-3+"
-IUSE="cet doc gold gprofng multitarget +nls pgo +plugins static-libs test 
vanilla zstd"
+IUSE="cet debuginfod doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanilla zstd"
 
 # Variables that can be set here  (ignored for live ebuilds)
 # PATCH_VER          - the patchset version
@@ -19,7 +19,7 @@ IUSE="cet doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanill
 # PATCH_DEV          - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
 #                      for the patchsets
 
-PATCH_VER=2
+PATCH_VER=5
 PATCH_DEV=dilfridge
 
 if [[ ${PV} == 9999* ]]; then
@@ -52,6 +52,9 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
        >=sys-devel/binutils-config-3
        sys-libs/zlib
+       debuginfod? (
+               dev-libs/elfutils[debuginfod(-)]
+       )
        zstd? ( app-arch/zstd:= )
 "
 DEPEND="${RDEPEND}"
@@ -287,9 +290,7 @@ src_configure() {
                # {native,cross}/binutils, binutils-libs. bug #666100
                --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex 
multitarget mt st)
 
-               # Avoid automagic dependency on (currently prefix) systems
-               # systems with debuginfod library, bug #754753
-               --without-debuginfod
+               $(use_with debuginfod)
 
                # Avoid automagic dev-libs/msgpack dep, bug #865875
                --without-msgpack

diff --git a/sys-devel/binutils/binutils-9999.ebuild 
b/sys-devel/binutils/binutils-9999.ebuild
index d8c2553ece20..ce9b9958cd11 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/";
 
 LICENSE="GPL-3+"
-IUSE="cet doc gold gprofng multitarget +nls pgo +plugins static-libs test 
vanilla zstd"
+IUSE="cet debuginfod doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanilla zstd"
 
 # Variables that can be set here  (ignored for live ebuilds)
 # PATCH_VER          - the patchset version
@@ -52,6 +52,9 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
        >=sys-devel/binutils-config-3
        sys-libs/zlib
+       debuginfod? (
+               dev-libs/elfutils[debuginfod(-)]
+       )
        zstd? ( app-arch/zstd:= )
 "
 DEPEND="${RDEPEND}"
@@ -287,9 +290,7 @@ src_configure() {
                # {native,cross}/binutils, binutils-libs. bug #666100
                --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex 
multitarget mt st)
 
-               # Avoid automagic dependency on (currently prefix) systems
-               # systems with debuginfod library, bug #754753
-               --without-debuginfod
+               $(use_with debuginfod)
 
                # Avoid automagic dev-libs/msgpack dep, bug #865875
                --without-msgpack

diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
index 9b80e61912f4..3cc106863437 100644
--- a/sys-devel/binutils/metadata.xml
+++ b/sys-devel/binutils/metadata.xml
@@ -13,6 +13,7 @@
                <flag name="pgo">Build binutils with Profile Guided 
Optimization (PGO) and LTO</flag>
                <flag name="plugins">Enable plugin support in tools</flag>
                <flag name="multitarget">Adds support to binutils for cross 
compiling (does not work with gas)</flag>
+               <flag name="debuginfod">Enable debuginfod support via 
<pkg>dev-libs/elfutils</pkg> libdebuginfod</flag>
        </use>
        <upstream>
                <remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>

Reply via email to