From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/flex/files/fix-gen.patch | 17 ++++++++++++++++ recipes/flex/files/flex-lvalue.diff | 36 ++++++++++++++++++++++++++++++++++ recipes/flex/flex-2.5.31/include.patch | 27 +++++++++++++++++++++++++ recipes/flex/flex-native_2.5.31.bb | 10 ++++++++++ recipes/flex/flex.inc | 11 +++++++++++ recipes/flex/flex_2.5.31.bb | 9 +++++++++ 6 files changed, 110 insertions(+) create mode 100644 recipes/flex/files/fix-gen.patch create mode 100644 recipes/flex/files/flex-lvalue.diff create mode 100644 recipes/flex/flex-2.5.31/include.patch create mode 100644 recipes/flex/flex-native_2.5.31.bb create mode 100644 recipes/flex/flex.inc create mode 100644 recipes/flex/flex_2.5.31.bb (limited to 'recipes/flex') diff --git a/recipes/flex/files/fix-gen.patch b/recipes/flex/files/fix-gen.patch new file mode 100644 index 0000000000..55f4f6fdf5 --- /dev/null +++ b/recipes/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/recipes/flex/files/flex-lvalue.diff b/recipes/flex/files/flex-lvalue.diff new file mode 100644 index 0000000000..56ae539a6c --- /dev/null +++ b/recipes/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/recipes/flex/flex-2.5.31/include.patch b/recipes/flex/flex-2.5.31/include.patch new file mode 100644 index 0000000000..b60dcb29de --- /dev/null +++ b/recipes/flex/flex-2.5.31/include.patch @@ -0,0 +1,27 @@ + +# +# 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. + # diff --git a/recipes/flex/flex-native_2.5.31.bb b/recipes/flex/flex-native_2.5.31.bb new file mode 100644 index 0000000000..1e9354afde --- /dev/null +++ b/recipes/flex/flex-native_2.5.31.bb @@ -0,0 +1,10 @@ +require flex.inc +inherit native +PR = "r2" + +do_stage () { + install -m 0755 flex ${STAGING_BINDIR} + oe_libinstall -a libfl ${STAGING_LIBDIR} + ln -sf ./flex ${STAGING_BINDIR}/flex++ + ln -sf ./flex ${STAGING_BINDIR}/lex +} diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc new file mode 100644 index 0000000000..048b3cb47d --- /dev/null +++ b/recipes/flex/flex.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Flex is a tool for generating programs that recognize lexical patterns in text." +SECTION = "devel" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \ + file://flex-lvalue.diff;patch=1 \ + file://fix-gen.patch;patch=1" +S = "${WORKDIR}/flex-${PV}" + +inherit autotools + diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb new file mode 100644 index 0000000000..3062e2d8dc --- /dev/null +++ b/recipes/flex/flex_2.5.31.bb @@ -0,0 +1,9 @@ +require flex.inc +PR = "r4" + +SRC_URI += "file://include.patch;patch=1" + +do_stage() { + oe_libinstall -a libfl ${STAGING_LIBDIR} +} + -- cgit 1.2.3-korg