[PATCH 4/4] recipes: remove redundant autoreconf excludes

[Ross Burton <ross.burton@arm.com>]

With autoconf 2.73 autoreconf is better at not forcibly running aclocal
or autoheader if the relevant files are not managed by those tools.

This means we can remove a number of explicit excludes as they are no
longer needed.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb   | 1 -
 meta/recipes-connectivity/openssh/openssh_10.2p1.bb   | 2 --
 meta/recipes-connectivity/socat/socat_1.8.1.1.bb      | 2 --
 meta/recipes-core/readline/readline.inc               | 3 ---
 meta/recipes-devtools/diffstat/diffstat_1.68.bb       | 2 --
 meta/recipes-devtools/expect/expect_5.45.4.bb         | 2 --
 meta/recipes-devtools/help2man/help2man_1.49.3.bb     | 4 ----
 meta/recipes-devtools/quilt/quilt.inc                 | 2 --
 meta/recipes-devtools/ruby/ruby_4.0.1.bb              | 2 --
 meta/recipes-devtools/subversion/subversion_1.14.5.bb | 2 --
 meta/recipes-devtools/tcltk/tcl_9.0.3.bb              | 1 -
 meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb           | 1 -
 meta/recipes-extended/bash/bash.inc                   | 1 -
 meta/recipes-extended/cups/cups.inc                   | 2 --
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc       | 3 ---
 meta/recipes-support/nettle/nettle_3.10.2.bb          | 2 --
 16 files changed, 32 deletions(-)

diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb b/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb
index 1b10001035b..9b259396f06 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb
@@ -25,7 +25,6 @@ EXTRA_OECONF = " \
                  --without-dag \
                  --without-dpdk \
                  "
-EXTRA_AUTORECONF += "--exclude=aclocal"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
diff --git a/meta/recipes-connectivity/openssh/openssh_10.2p1.bb b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
index 929c9e4b9fb..96cb09acc0e 100644
--- a/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
@@ -66,8 +66,6 @@ PACKAGECONFIG[hostkey-rsa] = ""
 PACKAGECONFIG[hostkey-ecdsa] = ""
 PACKAGECONFIG[hostkey-ed25519] = ""
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 # login path is hardcoded in sshd
 EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
diff --git a/meta/recipes-connectivity/socat/socat_1.8.1.1.bb b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
index f6f2a3304b9..e662c79a754 100644
--- a/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
@@ -17,8 +17,6 @@ SRC_URI[sha256sum] = "5ebc636b7f427053f98806696521653a614c7e06464910353cbf54e232
 
 inherit autotools
 
-EXTRA_AUTORECONF += "--exclude=autoheader"
-
 EXTRA_OECONF += "ac_cv_have_z_modifier=yes \
                  ac_cv_header_bsd_libutil_h=no \
                  sc_cv_termios_ispeed=no \
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 06630dc455c..8b07ecbcce7 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -17,9 +17,6 @@ SRC_URI += "file://inputrc"
 
 inherit autotools texinfo
 
-# Ensure we don't delete the shipped aclocal.m4 or config.h.in
-EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
-
 EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library"
 
 LEAD_SONAME = "libreadline.so"
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.68.bb b/meta/recipes-devtools/diffstat/diffstat_1.68.bb
index 4bc18158378..ce1ba79c2d1 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.68.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.68.bb
@@ -17,8 +17,6 @@ SRC_URI[sha256sum] = "89f9294a8ac74fcef6f1b9ac408f43ebedf8d208e3efe0b99b4acc16dc
 
 inherit autotools gettext ptest
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 do_install_ptest() {
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index 48b5b0d934b..f24dd3b7c81 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -39,8 +39,6 @@ UPSTREAM_CHECK_REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/"
 
 S = "${UNPACKDIR}/${BPN}${PV}"
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 CFLAGS += "-std=gnu17"
 
 do_install:append() {
diff --git a/meta/recipes-devtools/help2man/help2man_1.49.3.bb b/meta/recipes-devtools/help2man/help2man_1.49.3.bb
index 75931a511f5..1ba8d6090a1 100644
--- a/meta/recipes-devtools/help2man/help2man_1.49.3.bb
+++ b/meta/recipes-devtools/help2man/help2man_1.49.3.bb
@@ -10,10 +10,6 @@ SRC_URI[sha256sum] = "4d7e4fdef2eca6afe07a2682151cea78781e0a4e8f9622142d9f70c083
 
 inherit autotools
 
-# This is a hand-maintained aclocal.m4 but our autotools class currently deletes
-# aclocal.m4.
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 EXTRA_OECONF = "--disable-nls"
 
 do_install:append () {
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 59d13237e2f..387e132b602 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -28,8 +28,6 @@ CLEANBROKEN = "1"
 EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch --without-sendmail"
 EXTRA_OECONF:append:class-native = " --disable-nls"
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column"
 
 # Make sure we don't have "-w" in shebang lines: it breaks using
diff --git a/meta/recipes-devtools/ruby/ruby_4.0.1.bb b/meta/recipes-devtools/ruby/ruby_4.0.1.bb
index e51d0d3e9cf..93df86333ea 100644
--- a/meta/recipes-devtools/ruby/ruby_4.0.1.bb
+++ b/meta/recipes-devtools/ruby/ruby_4.0.1.bb
@@ -34,8 +34,6 @@ UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
 
 inherit autotools ptest pkgconfig
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 # This snippet lets compiled extensions which rely on external libraries,
 # such as zlib, compile properly.  If we don't do this, then when extmk.rb
 # runs, it uses the native libraries instead of the target libraries, and so
diff --git a/meta/recipes-devtools/subversion/subversion_1.14.5.bb b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
index 47e2b6c6932..13bec4ad595 100644
--- a/meta/recipes-devtools/subversion/subversion_1.14.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
@@ -42,8 +42,6 @@ EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig"
 CPPFLAGS += "-P"
 BUILD_CPPFLAGS += "-P"
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 do_configure:prepend () {
     # autogen.sh manually puts things in the right place, and libtoolize doesn't
     # work as they don't use aclocal
diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb b/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
index 18de3a333a2..ce8598fee6d 100644
--- a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
+++ b/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
@@ -34,7 +34,6 @@ VER = "${PV}"
 inherit autotools ptest binconfig
 
 AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
-EXTRA_AUTORECONF = "--exclude=aclocal"
 
 EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9 --disable-zipfs"
 
diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
index 968cd6778e8..1b08fda5fa6 100644
--- a/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
+++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
@@ -38,7 +38,6 @@ VER = "${PV}"
 inherit autotools ptest binconfig
 
 AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
-EXTRA_AUTORECONF = "--exclude=aclocal"
 
 EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8"
 
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 634209c9115..858088cc772 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -7,7 +7,6 @@ DEPENDS = "ncurses bison-native virtual/libiconv"
 
 inherit autotools gettext texinfo update-alternatives ptest
 
-EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
 EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8"
 
 # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 24ebcc4aae5..2724ce72fba 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -63,8 +63,6 @@ EXTRA_OECONF = " \
                DSOFLAGS='${LDFLAGS}' \
                "
 
-EXTRA_AUTORECONF += "--exclude=autoheader"
-
 do_install () {
 	oe_runmake "BUILDROOT=${D}" install
 
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index 5a1b44a71c3..f8c0d8ab838 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -36,9 +36,6 @@ EXTRA_OECONF = "--enable-xim \
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
 
-# Ensure we don't delete the shipped aclocal.m4
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 do_compile:prepend () {
 	echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
 	echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
diff --git a/meta/recipes-support/nettle/nettle_3.10.2.bb b/meta/recipes-support/nettle/nettle_3.10.2.bb
index e651f68cb94..7b7be5f5941 100644
--- a/meta/recipes-support/nettle/nettle_3.10.2.bb
+++ b/meta/recipes-support/nettle/nettle_3.10.2.bb
@@ -26,8 +26,6 @@ UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
 
 inherit autotools ptest multilib_header lib_package
 
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
 EXTRA_OECONF = "--disable-openssl"
 
 EXTRA_OECONF:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}"
-- 
2.43.0