summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-06-20 22:20:06 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-06-30 23:30:26 -0700
commitd74cf86d1e540d7476a5f1ed111ba49cc0988ad7 (patch)
tree3ebbafa2e0389cea580c260e726e3c9b83f8d98b /meta
parentf2f0e69ede55ee3eb50c508fb4640cb53c0dc5f6 (diff)
downloadpoky-d74cf86d1e540d7476a5f1ed111ba49cc0988ad7.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/flex/flex-2.5.31/include.patch27
-rw-r--r--meta/packages/flex/flex.inc4
-rw-r--r--meta/packages/flex/flex/fix-gen.patch17
-rw-r--r--meta/packages/flex/flex/flex-lvalue.diff36
-rw-r--r--meta/packages/flex/flex_2.5.31.bb6
-rw-r--r--meta/packages/flex/flex_2.5.35.bb4
6 files changed, 5 insertions, 89 deletions
diff --git a/meta/packages/flex/flex-2.5.31/include.patch b/meta/packages/flex/flex-2.5.31/include.patch
deleted file mode 100644
index b60dcb29de..0000000000
--- a/meta/packages/flex/flex-2.5.31/include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- flex-2.5.31/Makefile.am~include
7+++ flex-2.5.31/Makefile.am
8@@ -141,7 +141,7 @@
9 tests
10
11 localedir = $(datadir)/locale
12-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
13+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
14 LIBS = @LIBINTL@ @LIBS@
15
16 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
17--- flex-2.5.31/Makefile.in~include
18+++ flex-2.5.31/Makefile.in
19@@ -292,7 +292,7 @@
20
21
22 localedir = $(datadir)/locale
23-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
24+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
25
26 # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
27 #
diff --git a/meta/packages/flex/flex.inc b/meta/packages/flex/flex.inc
index d348d78cb1..da95a5e25e 100644
--- a/meta/packages/flex/flex.inc
+++ b/meta/packages/flex/flex.inc
@@ -5,9 +5,7 @@ SECTION = "devel"
5LICENSE = "BSD" 5LICENSE = "BSD"
6DEPENDS = "gettext" 6DEPENDS = "gettext"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
9 file://flex-lvalue.diff;patch=1 \
10 file://fix-gen.patch;patch=1"
11 9
12inherit autotools 10inherit autotools
13 11
diff --git a/meta/packages/flex/flex/fix-gen.patch b/meta/packages/flex/flex/fix-gen.patch
deleted file mode 100644
index 55f4f6fdf5..0000000000
--- a/meta/packages/flex/flex/fix-gen.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- flex-2.5.31/gen.c~fix-gen
7+++ flex-2.5.31/gen.c
8@@ -1812,8 +1812,7 @@
9 if (yytext_is_array) {
10 if (!reentrant){
11 indent_puts ("static int yy_more_offset = 0;");
12- }else{
13- indent_puts ("static int yy_prev_more_offset = 0;");
14+ indent_puts ("static int yy_prev_more_offset = 0;");
15 }
16 }
17 else if (!reentrant) {
diff --git a/meta/packages/flex/flex/flex-lvalue.diff b/meta/packages/flex/flex/flex-lvalue.diff
deleted file mode 100644
index 56ae539a6c..0000000000
--- a/meta/packages/flex/flex/flex-lvalue.diff
+++ /dev/null
@@ -1,36 +0,0 @@
1Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi/flex-lvalue.diff?bug=194844;msg=10;att=1
2
3according to posix 0,1,2 are already setup and this avoids
4the issues with
5| filter.c: In function 'filter_apply_chain':
6| filter.c:161: error: invalid lvalue in assignment
7| filter.c:163: error: invalid lvalue in assignment
8| filter.c:184: error: invalid lvalue in assignment
9
10
11diff -ur flex-2.5.31.ORIG/filter.c flex-2.5.31/filter.c
12--- flex-2.5.31.ORIG/filter.c 2003-03-25 16:39:08.000000000 +0000
13+++ flex-2.5.31/filter.c 2003-05-27 17:00:26.000000000 +0000
14@@ -157,11 +157,8 @@
15 if (chain->filter_func) {
16 int r;
17
18- /* setup streams again */
19- if ((stdin = fdopen (0, "r")) == NULL)
20- flexfatal (_("fdopen(0) failed"));
21- if ((stdout = fdopen (1, "w")) == NULL)
22- flexfatal (_("fdopen(1) failed"));
23+ /* POSIX says we inherit fd[0-2], so we don't need
24+ to do anything to them here */
25
26 if ((r = chain->filter_func (chain)) == -1)
27 flexfatal (_("filter_func failed"));
28@@ -181,8 +178,6 @@
29 if (dup2 (pipes[1], 1) == -1)
30 flexfatal (_("dup2(pipes[1],1)"));
31 close (pipes[1]);
32- if ((stdout = fdopen (1, "w")) == NULL)
33- flexfatal (_("fdopen(1) failed"));
34
35 return true;
36 }
diff --git a/meta/packages/flex/flex_2.5.31.bb b/meta/packages/flex/flex_2.5.31.bb
deleted file mode 100644
index 7ca7c7ee30..0000000000
--- a/meta/packages/flex/flex_2.5.31.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require flex.inc
2PR = "r5"
3
4SRC_URI += "file://include.patch;patch=1"
5
6BBCLASSEXTEND = "native"
diff --git a/meta/packages/flex/flex_2.5.35.bb b/meta/packages/flex/flex_2.5.35.bb
new file mode 100644
index 0000000000..f5f20f47ea
--- /dev/null
+++ b/meta/packages/flex/flex_2.5.35.bb
@@ -0,0 +1,4 @@
1require flex.inc
2PR = "r0"
3
4BBCLASSEXTEND = "native"