]> code.ossystems Code Review - openembedded-core.git/commitdiff
gperf: don't use aclocal.m4/acinclude.m4 dance
authorRoss Burton <ross.burton@intel.com>
Thu, 30 Nov 2017 13:15:24 +0000 (13:15 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 10 Dec 2017 22:41:40 +0000 (22:41 +0000)
gperf doesn't use aclocal so don't call aclocal.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-extended/gperf/gperf_3.1.bb

index c680ee183cbe961235a4a6ed53f5acc34b36a89b..f61b2a329af8d92f6155bcac0d662a84ed6502b8 100644 (file)
@@ -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"