Flex: use proper m4 binary on target

flex tries to execute:

/data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/m4

As workaround you can:

mkdir -p /data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/
ln -s /usr/bin/m4 /data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/

So this is a bug how OE builds flex.

flex tries to execute:

/data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/m4

As workaround you can:

mkdir -p /data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/
ln -s /usr/bin/m4 /data/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/

So this is a bug how OE builds flex.

https://bugs.launchpad.net/linaro-aarch64/+bug/1106865

(From OE-Core rev: 215bcc780d9bc4a7d96d1c706db80abe4ef659dd)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 472813be90e45b6dddbb8603d3c786ead51403c6..517db1626a4890e0555228f09abeb743fe12fbc2 100644 (file)
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -10,6 +10,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
 
 inherit autotools gettext
 
-do_install_append_class-native() {
-       create_wrapper ${D}/${bindir}/flex M4=${STAGING_BINDIR_NATIVE}/m4
+M4 = "${bindir}/m4"
+M4_class-native = "${STAGING_BINDIR_NATIVE}/m4"
+
+do_install_append() {
+       create_wrapper ${D}/${bindir}/flex M4=${M4}
 }