[oe-commits] Bernhard Reutner-Fischer : flex: remove version specifics from generic inc

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8816d38c3b1ec26bc9967875767e3b67ac8596d8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8816d38c3b1ec26bc9967875767e3b67ac8596d8

Author: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Date:   Mon Feb  8 22:14:30 2010 +0100

flex: remove version specifics from generic inc

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>

---

 recipes/flex/flex-native_2.5.31.bb |    4 ++--
 recipes/flex/flex.inc              |    3 ---
 recipes/flex/flex_2.5.31.bb        |    5 ++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/flex/flex-native_2.5.31.bb b/recipes/flex/flex-native_2.5.31.bb
index 1e9354a..de3f215 100644
--- a/recipes/flex/flex-native_2.5.31.bb
+++ b/recipes/flex/flex-native_2.5.31.bb
@@ -1,6 +1,6 @@
-require flex.inc
+require flex_${PV}.bb
 inherit native
-PR = "r2"
+PR = "r3"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc
index 4ebd44a..37e34fe 100644
--- a/recipes/flex/flex.inc
+++ b/recipes/flex/flex.inc
@@ -2,9 +2,6 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \
-           file://flex-lvalue.diff;patch=1 \
-           file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb
index e247a03..ae9e6f9 100644
--- a/recipes/flex/flex_2.5.31.bb
+++ b/recipes/flex/flex_2.5.31.bb
@@ -1,7 +1,10 @@
 require flex.inc
 PR = "r5"
 
-SRC_URI += "file://include.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
+           file://flex-lvalue.diff;patch=1 \
+           file://fix-gen.patch;patch=1 \
+           file://include.patch;patch=1"
 
 do_stage() {
 	oe_libinstall -a libfl ${STAGING_LIBDIR}