commit: 6c5bb90fca515fb854e5c567decd7528df32f354
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 22:45:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 3 02:48:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5bb90f
xorg-3.eclass: conditionalize autotools deps on XORG_EAUTORECONF
xorg-3.eclass only calls autoreconf if XORG_EAUTORECONF is set, although
the logic got cleaned up more in fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42.
We therefore don't need to depend on autoconf, automake, etc unless
XORG_EAUTORECONF is set. Set AUTOTOOLS_AUTO_DEPEND from autotools.eclass
to opt-out of the auto dependencies and use the AUTOTOOLS_DEPEND variable
it sets when XORG_EAUTORECONF.
Note that libtool.eclass still adds a dep on elt-patches so we're OK
for that part (we call elibtoolize where we can).
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/xorg-3.eclass | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 21cddc92773d..ee4038533bfd 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -58,6 +58,7 @@ fi
: "${XORG_MULTILIB:="no"}"
# we need to inherit autotools first to get the deps
+AUTOTOOLS_AUTO_DEPEND=no
inherit autotools libtool multilib toolchain-funcs flag-o-matic \
${FONT_ECLASS} ${GIT_ECLASS}
unset FONT_ECLASS GIT_ECLASS
@@ -129,9 +130,7 @@ fi
# Set up autotools shared dependencies
# Remember that all versions here MUST be stable
-EAUTORECONF_DEPEND+="
- >=dev-build/libtool-2.2.6a
- sys-devel/m4"
+EAUTORECONF_DEPEND+=" ${AUTOTOOLS_DEPEND}"
if [[ ${PN} != util-macros ]] ; then
EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18"
# Required even by xorg-server
