From eaa2d77d79d81ceeac9b82f0c98ad86882821f80 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Mon, 1 Mar 2010 15:44:43 +0100
Subject: [PATCH] bison: merged Poky changes (BBEXTENDCLASS + new staging)

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 recipes/bison/bison-native_2.0.bb | 21 ---------------------
 recipes/bison/bison-native_2.3.bb | 22 ----------------------
 recipes/bison/bison_2.0.bb        | 11 ++---------
 recipes/bison/bison_2.3.bb        | 14 ++------------
 4 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 recipes/bison/bison-native_2.0.bb
 delete mode 100644 recipes/bison/bison-native_2.3.bb

diff --git a/recipes/bison/bison-native_2.0.bb b/recipes/bison/bison-native_2.0.bb
deleted file mode 100644
index 760295db6d..0000000000
--- a/recipes/bison/bison-native_2.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require bison_${PV}.bb
-SECTION = "devel"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
-S = "${WORKDIR}/bison-${PV}"
-PR = "r2"
-
-inherit native autotools
-
-do_stage() {
-	rm -f ${STAGING_BINDIR}/yacc
-	rm -f ${STAGING_BINDIR}/bison
-	install -m 0755 src/bison ${STAGING_BINDIR}/
-	cat >${STAGING_BINDIR}/yacc <<EOF
-#!/bin/sh
-exec ${STAGING_BINDIR}/bison -y "\$@"
-EOF
-	chmod a+rx ${STAGING_BINDIR}/yacc
-	install -d ${STAGING_DATADIR}/bison/m4sugar
-	install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_DATADIR}/bison/
-	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/
-}
diff --git a/recipes/bison/bison-native_2.3.bb b/recipes/bison/bison-native_2.3.bb
deleted file mode 100644
index af6249ac9d..0000000000
--- a/recipes/bison/bison-native_2.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require bison_${PV}.bb
-SECTION = "devel"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
-S = "${WORKDIR}/bison-${PV}"
-PR="r1"
-
-inherit native autotools
-
-do_stage() {
-	rm -f ${STAGING_BINDIR}/yacc
-	rm -f ${STAGING_BINDIR}/bison
-	install -m 0755 src/bison ${STAGING_BINDIR}/
-	cat >${STAGING_BINDIR}/yacc <<EOF
-#!/bin/sh
-exec ${STAGING_BINDIR}/bison -y "\$@"
-EOF
-	chmod a+rx ${STAGING_BINDIR}/yacc
-	install -d ${STAGING_DATADIR}/bison/m4sugar
-	install -m 0755 data/c.m4 data/c++.m4 data/glr.c data/glr.cc data/lalr1.cc data/location.cc data/yacc.c ${STAGING_DATADIR}/bison/
-
-	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/
-}
diff --git a/recipes/bison/bison_2.0.bb b/recipes/bison/bison_2.0.bb
index edf549f442..6127bef993 100644
--- a/recipes/bison/bison_2.0.bb
+++ b/recipes/bison/bison_2.0.bb
@@ -1,10 +1,3 @@
-DESCRIPTION = "GNU Project parser generator (yacc replacement)."
-HOMEPAGE = "http://www.gnu.org/software/bison/"
-LICENSE = "GPL"
-SECTION = "devel"
-PRIORITY = "optional"
+require bison.inc
 
-SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
-
-inherit autotools
+PR = "${INCPR}.0"
diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb
index 729756b0fd..fda9b160a9 100644
--- a/recipes/bison/bison_2.3.bb
+++ b/recipes/bison/bison_2.3.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "GNU Project parser generator (yacc replacement)."
-HOMEPAGE = "http://www.gnu.org/software/bison/"
-LICENSE = "GPL"
-SECTION = "devel"
-PRIORITY = "optional"
+require bison.inc
 
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
-
-inherit autotools
+PR = "${INCPR}.0"
 
 # >> bison-2.3-r0: /usr/lib/liby.a
 # That one is a special case: it wants to stay in the main bison package,
@@ -17,4 +8,3 @@ inherit autotools
 # static-only library; that might be an error.
 
 FILES_${PN} += "${libdir}/liby.a"
-
-- 
2.39.5