summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-11-06 15:07:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:24 +0000
commit9a6ee8b447ee6070b23bb11fd3dd7fabf0d9ab80 (patch)
tree54e62fec36e4ec99e09868609061227dd289bae6
parentb74b2356bf53af7ceb08008020a1f027b2737e34 (diff)
downloadpoky-9a6ee8b447ee6070b23bb11fd3dd7fabf0d9ab80.tar.gz
flex: fix m4 issue on target
Flex needs m4 to run (see below) and, since the create_wrapper introduces a bash dependency on target, give the path to m4 binary in the configure command line. Snippet from the flex documentation: "The macro processor m4 must be installed wherever flex is installed. <...> m4 is only required at the time you run flex." [YOCTO #5329] (From OE-Core rev: 64030f37b34f75144f53eef42d5822ede79e08bd) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/flex/flex.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 43f1dda01c..96d5de5f74 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -13,6 +13,9 @@ inherit autotools gettext
13M4 = "${bindir}/m4" 13M4 = "${bindir}/m4"
14M4_class-native = "${STAGING_BINDIR_NATIVE}/m4" 14M4_class-native = "${STAGING_BINDIR_NATIVE}/m4"
15 15
16EXTRA_OECONF += "ac_cv_path_M4=${M4}"
17EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4"
18
16do_install_append_class-native() { 19do_install_append_class-native() {
17 create_wrapper ${D}/${bindir}/flex M4=${M4} 20 create_wrapper ${D}/${bindir}/flex M4=${M4}
18} 21}
@@ -20,3 +23,5 @@ do_install_append_class-native() {
20do_install_append_class-nativesdk() { 23do_install_append_class-nativesdk() {
21 create_wrapper ${D}/${bindir}/flex M4=${M4} 24 create_wrapper ${D}/${bindir}/flex M4=${M4}
22} 25}
26
27RDEPENDS_${PN} += "m4"