commit: 9636733d908927d670b046956026472b4f27bad3
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 23:13:15 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 23:39:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9636733d
dev-util/libabigail: drop unconditional eautoreconf
We still need this for the live ebuild for obvious reasons. But we were
running it against release tarballs as well, with a comment from 2019
that said ltmain.sh contained broken redhat spec file references. This
is not a problem today (cannot find the relevant string, builds fine) so
it appears the release tooling they used is no longer broken and we can
remove this workaround.
All we need now is the usual elibtoolize dance, a much smaller
dependency set.
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
dev-util/libabigail/libabigail-2.5.ebuild | 12 +++++++-----
dev-util/libabigail/libabigail-9999.ebuild | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dev-util/libabigail/libabigail-2.5.ebuild
b/dev-util/libabigail/libabigail-2.5.ebuild
index c91b1fc7ec2d..b4e4ee065a70 100644
--- a/dev-util/libabigail/libabigail-2.5.ebuild
+++ b/dev-util/libabigail/libabigail-2.5.ebuild
@@ -16,14 +16,14 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
HOMEPAGE="https://sourceware.org/libabigail/";
if [[ ${PV} == 9999 ]] ; then
LIBABIGAIL_DOCS_PREBUILT=0
EGIT_REPO_URI="https://sourceware.org/git/libabigail.git";
- inherit git-r3
+ inherit autotools git-r3
else
SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz";
if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +58,11 @@ BDEPEND="
src_prepare() {
default
- # need to run our autotools, due to ltmain.sh including Redhat calls:
- # cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No
such file or directory
- eautoreconf
+ if [[ ${PV} = 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
my_src_configure() {
diff --git a/dev-util/libabigail/libabigail-9999.ebuild
b/dev-util/libabigail/libabigail-9999.ebuild
index 0e0b6d252158..e83ef1cd10f5 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -16,14 +16,14 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
HOMEPAGE="https://sourceware.org/libabigail/";
if [[ ${PV} == 9999 ]] ; then
LIBABIGAIL_DOCS_PREBUILT=0
EGIT_REPO_URI="https://sourceware.org/git/libabigail.git";
- inherit git-r3
+ inherit autotools git-r3
else
SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz";
if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +58,11 @@ BDEPEND="
src_prepare() {
default
- # need to run our autotools, due to ltmain.sh including Redhat calls:
- # cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No
such file or directory
- eautoreconf
+ if [[ ${PV} = 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
my_src_configure() {
