recipes: remove redundant autoreconf excludes

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb b/meta/recipes-connectivity/libpcap/libpcap_1.10.6.bb
index 1b10001035b7fe49beaf7b581c68a0a2b5d8eef1..9b259396f06143abb08aab02f8e774d85ba1f49f 100644 (file)
--- 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 929c9e4b9fb54717ca63c56e1758a4fba5dc7705..96cb09acc0e91569a8cbcd2b850d1e9b8511b0ed 100644 (file)
--- 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 f6f2a3304b97400f8e8d35c9cf79ae7befc0bb9b..e662c79a754c2e0f0532be3b338b7c23e3f6d167 100644 (file)
--- 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 06630dc455cbe1686bd2ae400ab3af0538b29873..8b07ecbcce707516286e198458e9eb3771f06ec6 100644 (file)
--- 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 4bc1815837892bcfbd9e7ed1f87984590297796f..ce1ba79c2d184b08b7933003dd23769fc7a0c556 100644 (file)
--- 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 48b5b0d934bf00b8594b5afcf68065a421c04110..f24dd3b7c81eca7725f4c2307bfffc38984d8ec6 100644 (file)
--- 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 75931a511f5d3b0db06f67c1222e8fac67558f04..1ba8d6090a118634b785a948da46f201971684d0 100644 (file)
--- 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 59d13237e2fb7394251392dc08a83ae5ddda0144..387e132b60289f2a704e9fbdc05a3203d666e49c 100644 (file)
--- 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 e51d0d3e9cfcf1c3ede0c42de884f43a200b7b0e..93df86333ea00954133192aadcfba58d0ed86bfc 100644 (file)
--- 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 47e2b6c6932292b157c190f06fa39026fb1379c7..13bec4ad5956ab958f468c8114963702523e1f82 100644 (file)
--- 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 18de3a333a2905520bfc32f1513ebb9be13fe4b9..ce8598fee6d1dde2f7af74ed1c2d4ee8ea048920 100644 (file)
--- 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 968cd6778e8f02b13ba136cccd356082f85ee235..1b08fda5fa66af508ef785d5bddeebc04277b9c2 100644 (file)
--- 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 634209c911520be9d61e67fbd2a53be5a70f478d..858088cc772388846f62f84b90aca71ffebc0349 100644 (file)
--- 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 24ebcc4aae5987b4a244c4a59a4b879b223fe933..2724ce72fbaec240965ec0e98476f94c8b91eaeb 100644 (file)
--- 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 5a1b44a71c3ae1138a5836c27fca1994f4393a46..f8c0d8ab8381b8033e6d56e1336c4bceb62b7d17 100644 (file)
--- 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 e651f68cb949129dc9827b192a5304fdfff7690c..7b7be5f5941ed722f90796b05d3770f7fc06a647 100644 (file)
--- 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)}"