diff mbox series

bash: disable aclocal

Message ID 20171128171204.11665-1-ross.burton@intel.com
State Accepted
Commit 57fe9f61dd4c43f8267b831c1b177ad67010d78c
Headers show
Series bash: disable aclocal | expand

Commit Message

Ross Burton Nov. 28, 2017, 5:12 p.m. UTC
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 <ross.burton@intel.com>

---
 meta/recipes-extended/bash/bash.inc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Christopher Larson Nov. 28, 2017, 6:58 p.m. UTC | #1
On Tue, Nov 28, 2017 at 10:12 AM, Ross Burton <ross.burton@intel.com> wrote:

> 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.

>


Nice. Glad to see some of these kludges going away after all these years :)
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
<div dir="ltr">On Tue, Nov 28, 2017 at 10:12 AM, Ross Burton <span dir="ltr">&lt;<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Bash hand-maintains their aclocal.m4, so stop autoreconf from invoking aclocal<br>
and overwriting it.  This means we can remove the kludge to copy aclocal.m4 to<br>
acinclude.m4.<br></blockquote><div><br></div><div>Nice. Glad to see some of these kludges going away after all these years :)</div></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Christopher Larson<br>kergoth at gmail dot com<br>Founder - BitBake, OpenEmbedded, OpenZaurus<br>Senior Software Engineer, Mentor Graphics</div></div></div></div>
</div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index f4e1f7a11f4..89c35bd59c1 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
 }