eclass/autotools: Sync with Gentoo

It's from Gentoo commit 63f8947e8f7dcdbef199aca7794000da12dd17ba.
This commit is contained in:
Flatcar Buildbot 2025-06-16 07:09:30 +00:00 committed by Krzesimir Nowak
parent 1516a0153a
commit 7b1d5d8b8a

View File

@ -93,7 +93,7 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 )
# Do NOT change this variable in your ebuilds!
# If you want to force a newer minor version, you can specify the correct
# WANT value by using a colon: <PV>:<WANT_AUTOMAKE>
_LATEST_AUTOMAKE=( 1.17-r1:1.17 1.16.5:1.16 )
_LATEST_AUTOMAKE=( 1.18:1.18 1.17-r1:1.17 )
_automake_atom="dev-build/automake"
_autoconf_atom="dev-build/autoconf"
@ -378,7 +378,14 @@ eaclocal() {
# See bug #677002
if [[ ! -f "${T}"/aclocal/dirlist ]] ; then
mkdir "${T}"/aclocal || die
cat <<- EOF > "${T}"/aclocal/dirlist || die
if [[ "${LIBTOOLIZE:-}" == 'slibtoolize' ]]; then
cat <<- EOF > "${T}"/aclocal/dirlist || die
${BROOT}/usr/share/slibtool
${ESYSROOT}/usr/share/slibtool
EOF
fi
cat <<- EOF >> "${T}"/aclocal/dirlist || die
${BROOT}/usr/share/aclocal
${ESYSROOT}/usr/share/aclocal
EOF