Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/28 10:50:12+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/28 10:50:01+02:00 uni-frankfurt.de!mickeyl
use hardcoded SRC_URI for flex 2.5.31 - this source seems rare

BKrev: 42983c79iZblo5UI_bUItvRe1GOk9w

diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index 46b89e0..28dcda5 100644 (file)
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,6 +1,4 @@
 include flex.inc
 inherit native
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-${PV}.tar.bz2"
-S = "${WORKDIR}/flex-2.5.31"
 PR = "r0"

diff --git a/packages/flex/flex-native_2.5.4a.bb b/packages/flex/flex-native_2.5.4a.bb
deleted file mode 100644 (file)
index 80827a2..0000000
--- a/packages/flex/flex-native_2.5.4a.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-include flex.inc
-inherit native
-
-S = "${WORKDIR}/flex-2.5.4"
-PR = "r1"

diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc
index e69de29..41beef3 100644 (file)
--- a/packages/flex/flex.inc
+++ b/packages/flex/flex.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Flex is a tool for generating programs that recognize lexical patterns in text."
+SECTION = "devel"
+LICENSE = "BSD"
+
+SRC_URI = "http://mesh.dl.sf.net/lex/flex-2.5.31.tar.bz2"
+S = "${WORKDIR}/flex-${PV}"
+
+inherit native autotools
+
+do_stage () {
+       install -m 0755 flex ${STAGING_BINDIR}
+       oe_libinstall -a libfl ${STAGING_LIBDIR}
+       ln -sf ./flex ${STAGING_BINDIR}/flex++
+       ln -sf ./flex ${STAGING_BINDIR}/lex
+}

diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index b0ce4b9..b7c316f 100644 (file)
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,4 +1,2 @@
 include flex.inc
 PR = "r0"
-
-S = "${WORKDIR}/flex-2.5.31"

diff --git a/packages/flex/flex_2.5.4a.bb b/packages/flex/flex_2.5.4a.bb
deleted file mode 100644 (file)
index e69de29..0000000