From 1a7c1a4eb9508035225fa78664cf4a81ad4458d2 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 3 Nov 2009 00:02:32 -0300 Subject: [PATCH 028/118] bison-2.3: Fix m4 path. Signed-off-by: Lauro Ramos Venancio Signed-off-by: Ricardo Salveti de Araujo --- recipes/bison/bison_2.3.bb | 5 +++-- recipes/bison/files/fix_m4_path.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 recipes/bison/files/fix_m4_path.patch diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb index 729756b..97fe1d1 100644 --- a/recipes/bison/bison_2.3.bb +++ b/recipes/bison/bison_2.3.bb @@ -4,10 +4,11 @@ LICENSE = "GPL" SECTION = "devel" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ - file://m4.patch;patch=1" + file://m4.patch;patch=1 \ + file://fix_m4_path.patch;patch=1" inherit autotools diff --git a/recipes/bison/files/fix_m4_path.patch b/recipes/bison/files/fix_m4_path.patch new file mode 100644 index 0000000..f353c5b --- /dev/null +++ b/recipes/bison/files/fix_m4_path.patch @@ -0,0 +1,13 @@ +Index: bison-2.0/src/output.c +=================================================================== +--- bison-2.0.orig/src/output.c 2008-07-18 14:42:44.000000000 -0300 ++++ bison-2.0/src/output.c 2008-07-18 14:47:34.000000000 -0300 +@@ -523,7 +523,7 @@ + char *full_cm4; + char *full_skeleton; + char const *p; +- char const *m4 = (p = getenv ("M4")) ? p : M4; ++ char const *m4 = (p = getenv ("M4")) ? p : "/usr/bin/m4"; + char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR; + size_t skeleton_size = strlen (skeleton) + 1; + size_t pkgdatadirlen = strlen (pkgdatadir); -- 1.6.3.3