commit: 5466daf5317a20b0980b198cabfebcad22b42274
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 01:49:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 01:51:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5466daf5
dev-util/libabigail: fix automagic libbpf dep
I missed this in the configure diff, oops.
Signed-off-by: Sam James <sam <AT> gentoo.org>
...abigail-2.3.ebuild => libabigail-2.3-r1.ebuild} | 26 +++++++++++++---------
dev-util/libabigail/libabigail-9999.ebuild | 26 +++++++++++++---------
dev-util/libabigail/metadata.xml | 3 +++
3 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/dev-util/libabigail/libabigail-2.3.ebuild
b/dev-util/libabigail/libabigail-2.3-r1.ebuild
similarity index 88%
rename from dev-util/libabigail/libabigail-2.3.ebuild
rename to dev-util/libabigail/libabigail-2.3-r1.ebuild
index dd58132fd592..d65ee49694bc 100644
--- a/dev-util/libabigail/libabigail-2.3.ebuild
+++ b/dev-util/libabigail/libabigail-2.3-r1.ebuild
@@ -36,12 +36,13 @@ fi
LICENSE="Apache-2.0-with-LLVM-exceptions"
SLOT="0/2"
-IUSE="${LIBABIGAIL_DOCS_USEFLAG} test"
+IUSE="btf ${LIBABIGAIL_DOCS_USEFLAG} test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/elfutils
dev-libs/libxml2:2
+ btf? ( dev-libs/libbpf:= )
elibc_musl? ( sys-libs/fts-standalone )
"
DEPEND="${RDEPEND}"
@@ -63,16 +64,21 @@ src_prepare() {
}
my_src_configure() {
- econf \
- --disable-deb \
- --disable-fedabipkgdiff \
- --disable-rpm \
- --disable-rpm415 \
- --disable-ctf \
- --enable-bash-completion \
- --enable-python3 \
- $(use_enable doc apidoc) \
+ local myeconfargs=(
+ --disable-deb
+ --disable-fedabipkgdiff
+ --disable-rpm
+ --disable-rpm415
+ --disable-ctf
+ --disable-debug-ct-propagation
+ --enable-bash-completion
+ --enable-python3
+ $(use_enable btf)
+ $(use_enable doc apidoc)
$(use_enable doc manual)
+ )
+
+ econf "${myeconfargs[@]}"
}
my_src_compile() {
diff --git a/dev-util/libabigail/libabigail-9999.ebuild
b/dev-util/libabigail/libabigail-9999.ebuild
index dd58132fd592..d65ee49694bc 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -36,12 +36,13 @@ fi
LICENSE="Apache-2.0-with-LLVM-exceptions"
SLOT="0/2"
-IUSE="${LIBABIGAIL_DOCS_USEFLAG} test"
+IUSE="btf ${LIBABIGAIL_DOCS_USEFLAG} test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/elfutils
dev-libs/libxml2:2
+ btf? ( dev-libs/libbpf:= )
elibc_musl? ( sys-libs/fts-standalone )
"
DEPEND="${RDEPEND}"
@@ -63,16 +64,21 @@ src_prepare() {
}
my_src_configure() {
- econf \
- --disable-deb \
- --disable-fedabipkgdiff \
- --disable-rpm \
- --disable-rpm415 \
- --disable-ctf \
- --enable-bash-completion \
- --enable-python3 \
- $(use_enable doc apidoc) \
+ local myeconfargs=(
+ --disable-deb
+ --disable-fedabipkgdiff
+ --disable-rpm
+ --disable-rpm415
+ --disable-ctf
+ --disable-debug-ct-propagation
+ --enable-bash-completion
+ --enable-python3
+ $(use_enable btf)
+ $(use_enable doc apidoc)
$(use_enable doc manual)
+ )
+
+ econf "${myeconfargs[@]}"
}
my_src_compile() {
diff --git a/dev-util/libabigail/metadata.xml b/dev-util/libabigail/metadata.xml
index e306ca22e31b..d145f4ebc760 100644
--- a/dev-util/libabigail/metadata.xml
+++ b/dev-util/libabigail/metadata.xml
@@ -5,4 +5,7 @@
<email>s...@gentoo.org</email>
<name>David Seifert</name>
</maintainer>
+ <use>
+ <flag name="btf">Handle reading kernel debug files in BTF
format via <pkg>dev-libs/libbpf</pkg></flag>
+ </use>
</pkgmetadata>
