commit:     0d24f2e36daf9d95d2512a69305e124c3da6fc0d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  3 06:47:55 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 06:50:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d24f2e3

dev-util/ltrace: support libdwfl as unwinder

Add a new USE flag for this (pulling the whole elfutils in if set),
and make it mutually exclusive with unwind because src_configure fails
if both unwinders have been selected.

Closes: https://bugs.gentoo.org/903643
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 ....7.91_pre20221216.ebuild => ltrace-0.7.91_pre20221216-r1.ebuild} | 6 +++++-
 dev-util/ltrace/metadata.xml                                        | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild 
b/dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild
similarity index 91%
rename from dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild
rename to dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild
index 24b86f41a73f..851ee4b9d802 100644
--- a/dev-util/ltrace/ltrace-0.7.91_pre20221216.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.91_pre20221216-r1.ebuild
@@ -14,9 +14,12 @@ 
SRC_URI="https://gitlab.com/cespedes/${PN}/-/archive/${EGIT_COMMIT}.tar.bz2 -> $
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux test unwind"
+IUSE="debug elfutils selinux test unwind"
+
+REQUIRED_USE="?? ( elfutils unwind )"
 
 RDEPEND="virtual/libelf:=
+       elfutils? ( dev-libs/elfutils )
        selinux? ( sys-libs/libselinux )
        unwind? ( sys-libs/libunwind:= )"
 DEPEND="${RDEPEND}
@@ -55,5 +58,6 @@ src_configure() {
        econf \
                --disable-werror \
                $(use_enable debug) \
+               $(use_with elfutils) \
                $(use_with unwind libunwind)
 }

diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
index ca7a79566dae..7aee59bc9ad7 100644
--- a/dev-util/ltrace/metadata.xml
+++ b/dev-util/ltrace/metadata.xml
@@ -9,6 +9,7 @@
                <remote-id type="gitlab">cespedes/ltrace</remote-id>
        </upstream>
        <use>
+               <flag name="elfutils">Use libdwfl from 
<pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
                <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame 
unwinding support</flag>
        </use>
 </pkgmetadata>

Reply via email to