[PATCH] flex/bison: Don't hardcode M4 path

[Colin Walters <walters@verbum.org>]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

The flex and bison configure scripts use AC_PATH_PROG to get a
full path to m4 and embed this in config.h (and then to the
generated binary), but this blows up when the m4 binary is in a
temporary staging directory.
    
Since we are always shipping GNU m4, just set M4=m4 at configure
time so we don't use a hardcoded path.
    
This is an equivalent to what already exists in autoconf.bb.


[-- Attachment #2: 0001-flex-bison-Don-t-hardcode-M4-path.patch --]
[-- Type: text/x-patch, Size: 2301 bytes --]

From d33924d0de58e25bce73e5b4d61983fe0c1d0119 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 3 Jan 2012 18:47:32 -0500
Subject: [PATCH] flex/bison: Don't hardcode M4 path

The flex and bison configure scripts use AC_PATH_PROG to get a full
path to m4 and embed this in config.h (and then to the generated
binary), but this blows up when the m4 binary is in a temporary
staging directory.

Since we are always shipping GNU m4, just set M4=m4 at configure time
so we don't use a hardcoded path.

This is an equivalent to what already exists in autoconf.bb.
---
 meta/recipes-devtools/bison/bison_2.5.bb |   10 ++++------
 meta/recipes-devtools/flex/flex.inc      |    7 ++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-devtools/bison/bison_2.5.bb b/meta/recipes-devtools/bison/bison_2.5.bb
index c5113cd..0536dd4 100644
--- a/meta/recipes-devtools/bison/bison_2.5.bb
+++ b/meta/recipes-devtools/bison/bison_2.5.bb
@@ -21,16 +21,14 @@ SRC_URI = "${BASE_SRC_URI} \
 SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4"
 SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
 
+# We don't want to hardcode the m4 path since it will be found
+# in the staging directory.
+EXTRA_OECONF = " M4=m4"
+
 DEPENDS_virtclass-native = "gettext-minimal-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
 
 inherit autotools gettext
 acpaths = "-I ${S}/m4"
 
-do_install_append_virtclass-native() {
-	create_wrapper ${D}/${bindir}/bison \
-		M4=${STAGING_BINDIR_NATIVE}/m4 \
-		BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison
-}
-#bison-native encodes the staging M4 path
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 01f7571..a913d21 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -10,6 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
 
 inherit autotools gettext
 
-do_install_append_virtclass-native() {
-	create_wrapper ${D}/${bindir}/flex M4=${STAGING_BINDIR_NATIVE}/m4
-}
+# We don't want to hardcode the m4 path since it will be found
+# in the staging directory.
+EXTRA_OECONF = " M4=m4"
+
-- 
1.7.6.4