summaryrefslogtreecommitdiff
path: root/packages/flex
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-08-01 12:52:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-01 12:52:58 +0000
commitab67190c725b7084dcb313a800dd2efa679789cb (patch)
tree15b4a0293e5dcc72f84ebf742eaba167ffee1719 /packages/flex
parenta14d3881700b6e5cd6b6b414bf81094b2e0d903c (diff)
flex: add patch for flex bug 720976
Diffstat (limited to 'packages/flex')
-rw-r--r--packages/flex/files/.mtn2git_empty0
-rw-r--r--packages/flex/files/fix-gen.patch17
-rw-r--r--packages/flex/flex-native_2.5.31.bb3
-rw-r--r--packages/flex/flex.inc3
-rw-r--r--packages/flex/flex_2.5.31.bb2
5 files changed, 21 insertions, 4 deletions
diff --git a/packages/flex/files/.mtn2git_empty b/packages/flex/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/flex/files/.mtn2git_empty
diff --git a/packages/flex/files/fix-gen.patch b/packages/flex/files/fix-gen.patch
new file mode 100644
index 0000000000..55f4f6fdf5
--- /dev/null
+++ b/packages/flex/files/fix-gen.patch
@@ -0,0 +1,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- flex-2.5.31/gen.c~fix-gen
++++ flex-2.5.31/gen.c
+@@ -1812,8 +1812,7 @@
+ if (yytext_is_array) {
+ if (!reentrant){
+ indent_puts ("static int yy_more_offset = 0;");
+- }else{
+- indent_puts ("static int yy_prev_more_offset = 0;");
++ indent_puts ("static int yy_prev_more_offset = 0;");
+ }
+ }
+ else if (!reentrant) {
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index fa125d6be7..ff8a42772b 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,7 +1,6 @@
include flex.inc
inherit native
-
-PR = "r1"
+PR = "r2"
do_stage () {
install -m 0755 flex ${STAGING_BINDIR}
diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc
index b28ad9e055..6e605ac9be 100644
--- a/packages/flex/flex.inc
+++ b/packages/flex/flex.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
SECTION = "devel"
LICENSE = "BSD"
-SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \
+ file://fix-gen.patch;patch=1"
S = "${WORKDIR}/flex-${PV}"
inherit autotools
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 2263d8f7c1..b96c645136 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
include flex.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://include.patch;patch=1"