The bulk of these recipes used acpaths to work around argument list
limits as we passed the full path to every directory. As this behaviour
no longer happens we can remove these workarounds.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta/recipes-connectivity/inetutils/inetutils_2.5.bb | 2 --
meta/recipes-core/coreutils/coreutils_9.6.bb | 6 ------
meta/recipes-core/gettext/gettext_0.23.1.bb | 3 ---
meta/recipes-devtools/bison/bison_3.8.2.bb | 3 ---
meta/recipes-devtools/m4/m4-1.4.19.inc | 3 ---
meta/recipes-devtools/patch/patch_2.7.6.bb | 2 --
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 2 --
meta/recipes-extended/diffutils/diffutils_3.11.bb | 3 ---
meta/recipes-extended/grep/grep_3.11.bb | 3 ---
meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb | 2 --
meta/recipes-extended/tar/tar_1.35.bb | 6 ------
meta/recipes-extended/wget/wget.inc | 5 -----
meta/recipes-support/gmp/gmp_6.3.0.bb | 2 --
13 files changed, 42 deletions(-)
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb
b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb
index 7310f2dc47e..19bf7e1539b 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb
@@ -22,8 +22,6 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
inherit autotools gettext update-alternatives texinfo
-acpaths = "-I ./m4"
-
PACKAGECONFIG ??= "ftp uucpd \
${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6
ping6', '', d)} \
diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb
b/meta/recipes-core/coreutils/coreutils_9.6.bb
index 05277879343..17bd33958b9 100644
--- a/meta/recipes-core/coreutils/coreutils_9.6.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.6.bb
@@ -82,12 +82,6 @@ RPROVIDES:coreutils +=
"${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '
PACKAGE_BEFORE_PN:class-target += "${PN}-getlimits"
FILES:${PN}-getlimits = "${bindir}/getlimits"
-# Let aclocal use the relative path for the m4 file rather than the
-# absolute since coreutils has a lot of m4 files, otherwise there might
-# be an "Argument list too long" error when it is built in a long/deep
-# directory.
-acpaths = "-I ./m4"
-
# Deal with a separate builddir failure if src doesn't exist when creating
version.c/version.h
do_compile:prepend () {
mkdir -p ${B}/src
diff --git a/meta/recipes-core/gettext/gettext_0.23.1.bb
b/meta/recipes-core/gettext/gettext_0.23.1.bb
index da4e6c68500..cbc3e48890e 100644
--- a/meta/recipes-core/gettext/gettext_0.23.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.23.1.bb
@@ -63,9 +63,6 @@ PACKAGECONFIG[libxml] =
"--without-included-libxml,--with-included-libxml,libxml
PACKAGECONFIG[libunistring] =
"--with-libunistring-prefix=${STAGING_LIBDIR}/..,--with-included-libunistring,libunistring"
PACKAGECONFIG[msgcat-curses] =
"--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
-acpaths = '-I ${S}/gettext-runtime/m4 \
- -I ${S}/gettext-tools/m4'
-
do_install:append:libc-musl () {
rm -f ${D}${libdir}/charset.alias
rm -f ${D}${includedir}/libintl.h
diff --git a/meta/recipes-devtools/bison/bison_3.8.2.bb
b/meta/recipes-devtools/bison/bison_3.8.2.bb
index da138e35874..513d7ec287d 100644
--- a/meta/recipes-devtools/bison/bison_3.8.2.bb
+++ b/meta/recipes-devtools/bison/bison_3.8.2.bb
@@ -37,9 +37,6 @@ CACHED_CONFIGUREVARS +=
"${@bb.utils.contains('PACKAGECONFIG', 'readline', '', '
${@bb.utils.contains('PACKAGECONFIG', 'textstyle',
'', ' \
ac_cv_libtextstyle=no', d)}"
-# The automatic m4 path detection gets confused, so force the right value
-acpaths = "-I ./m4"
-
do_compile:prepend() {
for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done
}
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc
b/meta/recipes-devtools/m4/m4-1.4.19.inc
index 1d1f1eb477a..8fb13f543b2 100644
--- a/meta/recipes-devtools/m4/m4-1.4.19.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -23,9 +23,6 @@ LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\
file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
-# Fix "Argument list too long" error when len(TMPDIR) = 410
-acpaths = "-I ./m4"
-
EXTRA_OECONF += "--without-libsigsegv-prefix"
EXTRA_OEMAKE += "'infodir=${infodir}'"
diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb
b/meta/recipes-devtools/patch/patch_2.7.6.bb
index e0e44f9c977..a91944234f1 100644
--- a/meta/recipes-devtools/patch/patch_2.7.6.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.6.bb
@@ -18,8 +18,6 @@ SRC_URI[sha256sum] =
"8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74b
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-acpaths = "-I ${S}/m4 "
-
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 2b298eb5e85..baf37b0a9be 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -31,8 +31,6 @@ PACKAGECONFIG:class-native = ""
PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0
pkgconfig-native"
-acpaths = "-I ."
-
BBCLASSEXTEND = "native nativesdk"
# Set an empty dev package to ensure the base PN package gets
diff --git a/meta/recipes-extended/diffutils/diffutils_3.11.bb
b/meta/recipes-extended/diffutils/diffutils_3.11.bb
index 8f5a87c2db7..a4badc044e9 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.11.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.11.bb
@@ -15,9 +15,6 @@ EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr
--without-libsigsegv-prefix"
# latest gnulib is no longer able to handle this - I dare not try to fix that
maze of abstractions and generators
CFLAGS:mingw32 = " -DSA_RESTART=0"
-# Fix "Argument list too long" error when len(TMPDIR) = 410
-acpaths = "-I ./m4"
-
EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'"
inherit ptest
diff --git a/meta/recipes-extended/grep/grep_3.11.bb
b/meta/recipes-extended/grep/grep_3.11.bb
index cb3105de04c..0d36eba3b28 100644
--- a/meta/recipes-extended/grep/grep_3.11.bb
+++ b/meta/recipes-extended/grep/grep_3.11.bb
@@ -12,9 +12,6 @@ SRC_URI[sha256sum] =
"1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951
inherit autotools gettext texinfo pkgconfig
-# Fix "Argument list too long" error when len(TMPDIR) = 410
-acpaths = "-I ./m4"
-
do_configure:prepend () {
sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh
rm -f ${S}/m4/init.m4
diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
b/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
index bd3f40ab822..1f6de1d925d 100644
--- a/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
@@ -10,5 +10,3 @@ SRC_URI =
"${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
SRC_URI[sha256sum] =
"1b1203ca152ccd63983c3f2112f7fe6fa5afd453218ede5153d1b31e11bb8405"
inherit pkgconfig autotools
-
-acpaths = "-I ${S}/gl/m4 -I ${S}/m4"
diff --git a/meta/recipes-extended/tar/tar_1.35.bb
b/meta/recipes-extended/tar/tar_1.35.bb
index c7bd1d195e5..ea0993a9098 100644
--- a/meta/recipes-extended/tar/tar_1.35.bb
+++ b/meta/recipes-extended/tar/tar_1.35.bb
@@ -22,12 +22,6 @@ EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no"
-# Let aclocal use the relative path for the m4 file rather than the
-# absolute since tar has a lot of m4 files, otherwise there might
-# be an "Argument list too long" error when it is built in a long/deep
-# directory.
-acpaths = "-I ./m4"
-
do_install () {
autotools_do_install
ln -s tar ${D}${bindir}/gtar
diff --git a/meta/recipes-extended/wget/wget.inc
b/meta/recipes-extended/wget/wget.inc
index 51926e72962..151aeabcdce 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -38,8 +38,3 @@ PACKAGECONFIG[libuuid] =
"--with-libuuid,--without-libuuid,util-linux"
PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-
-# Let aclocal use the relative path for the m4 file rather than
-# absolute, otherwise there might be an "Argument list too long" error
-# when it is built in a long/deep directory.
-acpaths = "-I ./m4"
diff --git a/meta/recipes-support/gmp/gmp_6.3.0.bb
b/meta/recipes-support/gmp/gmp_6.3.0.bb
index fd4aec92fdb..2ce8ae385c0 100644
--- a/meta/recipes-support/gmp/gmp_6.3.0.bb
+++ b/meta/recipes-support/gmp/gmp_6.3.0.bb
@@ -17,8 +17,6 @@ SRC_URI =
"https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
"
SRC_URI[sha256sum] =
"ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb"
-acpaths = ""
-
EXTRA_OECONF += " --enable-cxx=detect"
EXTRA_OECONF:append:mipsarchr6 = " --disable-assembly"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#211882):
https://lists.openembedded.org/g/openembedded-core/message/211882
Mute This Topic: https://lists.openembedded.org/mt/111377384/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
