From 57fe9f61dd4c43f8267b831c1b177ad67010d78c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 28 Nov 2017 14:45:36 +0000 Subject: bash: disable aclocal Bash hand-maintains their aclocal.m4, so stop autoreconf from invoking aclocal and overwriting it. This means we can remove the kludge to copy aclocal.m4 to acinclude.m4. Signed-off-by: Ross Burton --- meta/recipes-extended/bash/bash.inc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index f4e1f7a11f..89c35bd59c 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -6,7 +6,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" EXTRA_OECONF = "--enable-job-control --without-bash-malloc" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -33,12 +33,6 @@ USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_compile_ptest () { oe_runmake buildtest } -- cgit 1.2.3-korg