dev-build/autoconf: Sync with Gentoo

It's from Gentoo commit d7dbfacbf92767bfa5aa46c9cc7ee12dcbcc558f.
This commit is contained in:
Krzesimir Nowak 2024-01-29 16:37:33 +01:00
parent 558b78ffc5
commit 1a6863cd64
8 changed files with 48 additions and 23 deletions

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -23,7 +23,7 @@ BDEPEND="
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
sys-apps/texinfo sys-apps/texinfo
>=sys-devel/autoconf-wrapper-13 >=dev-build/autoconf-wrapper-13
" "
PATCHES=( PATCHES=(

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -23,7 +23,7 @@ BDEPEND="
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
sys-apps/texinfo sys-apps/texinfo
>=sys-devel/autoconf-wrapper-13 >=dev-build/autoconf-wrapper-13
" "
PATCHES=( PATCHES=(
@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-perl-5.26.patch "${FILESDIR}"/${P}-perl-5.26.patch
"${FILESDIR}"/${P}-K-R-decls-clang.patch "${FILESDIR}"/${P}-K-R-decls-clang.patch
"${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch "${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch
"${FILESDIR}"/${P}-skip-AC_FUNC_GETLOADAVG-test.patch
) )
src_configure() { src_configure() {

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -22,7 +22,7 @@ else
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )"
fi fi
inherit toolchain-autoconf inherit toolchain-autoconf multiprocessing
DESCRIPTION="Used to create autoconfiguration files" DESCRIPTION="Used to create autoconfiguration files"
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@ -37,7 +37,7 @@ BDEPEND+="
" "
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
>=sys-devel/autoconf-wrapper-13 >=dev-build/autoconf-wrapper-13
!~sys-devel/${P}:2.5 !~sys-devel/${P}:2.5
" "
@ -79,3 +79,7 @@ src_prepare() {
# We already have an up to date autoconf.info page at this point. # We already have an up to date autoconf.info page at this point.
touch -r doc/{old_,}autoconf.texi || die touch -r doc/{old_,}autoconf.texi || die
} }
src_test() {
emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -21,7 +21,7 @@ else
S="${WORKDIR}"/${MY_P} S="${WORKDIR}"/${MY_P}
fi fi
inherit toolchain-autoconf inherit toolchain-autoconf multiprocessing
DESCRIPTION="Used to create autoconfiguration files" DESCRIPTION="Used to create autoconfiguration files"
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@ -35,7 +35,7 @@ IUSE="emacs"
BDEPEND=">=sys-devel/m4-1.4.16 BDEPEND=">=sys-devel/m4-1.4.16
>=dev-lang/perl-5.8" >=dev-lang/perl-5.8"
RDEPEND="${BDEPEND} RDEPEND="${BDEPEND}
>=sys-devel/autoconf-wrapper-15 >=dev-build/autoconf-wrapper-15
sys-devel/gnuconfig sys-devel/gnuconfig
!~sys-devel/${P}:2.5" !~sys-devel/${P}:2.5"
[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
@ -74,7 +74,7 @@ src_prepare() {
} }
src_test() { src_test() {
emake check emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
} }
src_install() { src_install() {

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -30,7 +30,7 @@ else
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
fi fi
inherit toolchain-autoconf inherit toolchain-autoconf multiprocessing
DESCRIPTION="Used to create autoconfiguration files" DESCRIPTION="Used to create autoconfiguration files"
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@ -47,7 +47,7 @@ BDEPEND+="
" "
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
>=sys-devel/autoconf-wrapper-15 >=dev-build/autoconf-wrapper-15
sys-devel/gnuconfig sys-devel/gnuconfig
!~sys-devel/${P}:2.5 !~sys-devel/${P}:2.5
" "
@ -89,7 +89,7 @@ src_prepare() {
} }
src_test() { src_test() {
emake check emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
} }
src_install() { src_install() {

View File

@ -1,10 +1,10 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
# Bumping notes: # Bumping notes:
# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper # * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper
# on new autoconf releases, as well as the dependency in RDEPEND below too. # on new autoconf releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass. # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass.
@ -35,7 +35,7 @@ else
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
fi fi
inherit toolchain-autoconf inherit toolchain-autoconf multiprocessing
DESCRIPTION="Used to create autoconfiguration files" DESCRIPTION="Used to create autoconfiguration files"
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@ -50,7 +50,7 @@ BDEPEND+="
" "
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
>=sys-devel/autoconf-wrapper-20231224 >=dev-build/autoconf-wrapper-20231224
sys-devel/gnuconfig sys-devel/gnuconfig
!~sys-devel/${P}:2.5 !~sys-devel/${P}:2.5
" "
@ -83,7 +83,7 @@ src_prepare() {
} }
src_test() { src_test() {
emake check emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
} }
src_install() { src_install() {

View File

@ -1,10 +1,10 @@
# Copyright 1999-2023 Gentoo Authors # Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
# Bumping notes: # Bumping notes:
# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper # * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper
# on new autoconf releases, as well as the dependency in RDEPEND below too. # on new autoconf releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass. # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass.
@ -50,7 +50,7 @@ BDEPEND+="
" "
RDEPEND=" RDEPEND="
${BDEPEND} ${BDEPEND}
>=sys-devel/autoconf-wrapper-20231224 >=dev-build/autoconf-wrapper-20231224
sys-devel/gnuconfig sys-devel/gnuconfig
!~sys-devel/${P}:2.5 !~sys-devel/${P}:2.5
" "

View File

@ -0,0 +1,20 @@
The macro itself is broken in autoconf-2.13 but this is caused by newer kernels
etc rather than anything else. Very, very few packages use autoconf-2.13, let
alone AC_FUNC_GETLOADAVG, so not going to worry about it much.
Do as Fedora and Debian do and skip the test for it.
https://bugs.gentoo.org/406723
https://bugs.gentoo.org/677926
--- a/testsuite/autoconf.s/syntax.exp
+++ b/testsuite/autoconf.s/syntax.exp
@@ -2,7 +2,8 @@
send_user "Checking for syntax errors in the specific tests...\n"
set script {s/^AC_DEFUN(\([^,]*\).*/\1/p}
-set macros [exec sed -n $script $srcdir/../acspecific.m4]
+# XXX: AC_FUNC_GETLOADAVG skipped for bug #406723, bug #677926
+set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v AC_FUNC_GETLOADAVG]
foreach mac $macros {
if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then {