sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

flex: upgrade from 2.5.31 to 2.5.35 

These patches removed from the recipe
 flex-lvalue.diff: already in the source
 fix-gen.patch: already in the source
 include.patch: already in the source

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
Nitin A Kamble 2010-06-20 22:20:06 -07:00 committed by Saul Wold
parent f2f0e69ede
commit d74cf86d1e
6 changed files with 5 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
meta/packages/flex/flex-2.5.31/include.patch vendored
View File

@ -1,27 +0,0 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- flex-2.5.31/Makefile.am~include
+++ flex-2.5.31/Makefile.am
@@ -141,7 +141,7 @@
tests
localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
LIBS = @LIBINTL@ @LIBS@
skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
--- flex-2.5.31/Makefile.in~include
+++ flex-2.5.31/Makefile.in
@@ -292,7 +292,7 @@
localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
# Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
#

4
meta/packages/flex/flex.inc
View File

@ -5,9 +5,7 @@ SECTION = "devel"
LICENSE = "BSD"
DEPENDS = "gettext"
SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \
file://flex-lvalue.diff;patch=1 \
file://fix-gen.patch;patch=1"
SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
inherit autotools

17
meta/packages/flex/flex/fix-gen.patch
View File

@ -1,17 +0,0 @@
#
# 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) {

36
meta/packages/flex/flex/flex-lvalue.diff
View File

@ -1,36 +0,0 @@
Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi/flex-lvalue.diff?bug=194844;msg=10;att=1
according to posix 0,1,2 are already setup and this avoids
the issues with
| filter.c: In function 'filter_apply_chain':
| filter.c:161: error: invalid lvalue in assignment
| filter.c:163: error: invalid lvalue in assignment
| filter.c:184: error: invalid lvalue in assignment
diff -ur flex-2.5.31.ORIG/filter.c flex-2.5.31/filter.c
--- flex-2.5.31.ORIG/filter.c 2003-03-25 16:39:08.000000000 +0000
+++ flex-2.5.31/filter.c 2003-05-27 17:00:26.000000000 +0000
@@ -157,11 +157,8 @@
if (chain->filter_func) {
int r;
- /* setup streams again */
- if ((stdin = fdopen (0, "r")) == NULL)
- flexfatal (_("fdopen(0) failed"));
- if ((stdout = fdopen (1, "w")) == NULL)
- flexfatal (_("fdopen(1) failed"));
+ /* POSIX says we inherit fd[0-2], so we don't need
+ to do anything to them here */
if ((r = chain->filter_func (chain)) == -1)
flexfatal (_("filter_func failed"));
@@ -181,8 +178,6 @@
if (dup2 (pipes[1], 1) == -1)
flexfatal (_("dup2(pipes[1],1)"));
close (pipes[1]);
- if ((stdout = fdopen (1, "w")) == NULL)
- flexfatal (_("fdopen(1) failed"));
return true;
}

6
meta/packages/flex/flex_2.5.31.bb
View File

@ -1,6 +0,0 @@
require flex.inc
PR = "r5"
SRC_URI += "file://include.patch;patch=1"
BBCLASSEXTEND = "native"

4
meta/packages/flex/flex_2.5.35.bb Normal file
View File

@ -0,0 +1,4 @@
require flex.inc
PR = "r0"
BBCLASSEXTEND = "native"