diff options
author | Rene Wagner <rw@handhelds.org> | 2005-08-02 11:43:25 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-02 11:43:25 +0000 |
commit | fec6d9b12d01c5a1c450108ffb838335862a4051 (patch) | |
tree | 1304c6e8f62cb2989e781ea73bdc848c5f00d125 /packages/flex | |
parent | a4dc9b83d233a7b07e920e0eeceffdcf2053ab02 (diff) | |
parent | 0bef08582a7aa3378ba6cb4d1899dd9ae7267483 (diff) |
merge of 8893b7644179a244e95e78cea49c28cecbedc8b2
and 9ef371d5ab888cd926919c7bf505d283e4f19f54
Diffstat (limited to 'packages/flex')
-rw-r--r-- | packages/flex/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/flex/files/fix-gen.patch | 17 | ||||
-rw-r--r-- | packages/flex/flex-native_2.5.31.bb | 3 | ||||
-rw-r--r-- | packages/flex/flex.inc | 3 | ||||
-rw-r--r-- | packages/flex/flex_2.5.31.bb | 2 |
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" |