From e080880a82df7f9402a76f20b74e0f43b87f5b71 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 30 Nov 2017 13:15:24 +0000 Subject: gperf: don't use aclocal.m4/acinclude.m4 dance gperf doesn't use aclocal so don't call aclocal. Signed-off-by: Ross Burton --- meta/recipes-extended/gperf/gperf_3.1.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index c680ee183c..f61b2a329a 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb @@ -11,14 +11,8 @@ SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cd inherit autotools -# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of -# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal -EXTRA_AUTORECONF += " -I ${S}" - -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} +# The nested configures don't find the parent aclocal.m4 out of the box, so tell +# it where to look explicitly (mirroring the behaviour of upstream's Makefile.devel). +EXTRA_AUTORECONF += " -I ${S} --exclude=aclocal" BBCLASSEXTEND = "native" -- cgit 1.2.3-korg