From 8816d38c3b1ec26bc9967875767e3b67ac8596d8 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 8 Feb 2010 22:14:30 +0100
Subject: flex: remove version specifics from generic inc

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@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 1e9354afde..de3f215ea1 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 4ebd44a61b..37e34fe462 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 e247a03ee8..ae9e6f986b 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}
-- 
cgit 1.2.3-korg