bison: merged Poky changes (BBEXTENDCLASS + new staging)

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

diff --git a/recipes/bison/bison-native_2.0.bb b/recipes/bison/bison-native_2.0.bb
deleted file mode 100644 (file)
index 760295d..0000000
--- 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 (file)
index af6249a..0000000
--- 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 edf549f..6127bef 100644 (file)
--- 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 729756b..fda9b16 100644 (file)
--- 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"
-