From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 18:38:19 +0000
Subject: Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/flex/files/flex-lvalue.diff | 36 +++++++++++++++++++++++
 openembedded/packages/flex/flex.inc               |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 openembedded/packages/flex/files/flex-lvalue.diff

(limited to 'openembedded/packages/flex')

diff --git a/openembedded/packages/flex/files/flex-lvalue.diff b/openembedded/packages/flex/files/flex-lvalue.diff
new file mode 100644
index 000000000..56ae539a6
--- /dev/null
+++ b/openembedded/packages/flex/files/flex-lvalue.diff
@@ -0,0 +1,36 @@
+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;
+ }
diff --git a/openembedded/packages/flex/flex.inc b/openembedded/packages/flex/flex.inc
index 6e605ac9b..d6affad22 100644
--- a/openembedded/packages/flex/flex.inc
+++ b/openembedded/packages/flex/flex.inc
@@ -3,6 +3,7 @@ SECTION = "devel"
 LICENSE = "BSD"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \
+           file://flex-lvalue.diff;patch=1 \
            file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
-- 
cgit v1.2.3