aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-28 14:45:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-09 14:36:58 +0000
commit57fe9f61dd4c43f8267b831c1b177ad67010d78c (patch)
treec498a67ad5f7e1295dcb5030f75f519382773416
parent8313d9521360a32ab42b00018a95050017cdb1bd (diff)
downloadopenembedded-core-contrib-57fe9f61dd4c43f8267b831c1b177ad67010d78c.tar.gz
openembedded-core-contrib-57fe9f61dd4c43f8267b831c1b177ad67010d78c.tar.bz2
openembedded-core-contrib-57fe9f61dd4c43f8267b831c1b177ad67010d78c.zip
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 <ross.burton@intel.com>
-rw-r--r--meta/recipes-extended/bash/bash.inc8
1 files changed, 1 insertions, 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
}