From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Wed, 8 Jun 2005 08:38:19 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~13987
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=098029540db01b60a84bcdebbcf1283bbca3fdfa;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/08 10:02:56+02:00 local!hrw
flex: with include.patch flex builds for arm(eb) target - credits goes to Dwayne Fontenot (jacques on #oe)

BKrev: 42a6ae7bE0QJkGFsptvQFxq_oBAbCw
---

diff --git a/packages/flex/flex-2.5.31/include.patch b/packages/flex/flex-2.5.31/include.patch
new file mode 100644
index 0000000000..b60dcb29de
--- /dev/null
+++ b/packages/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/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 8349355b89..5cec08d8f5 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,9 +1,4 @@
-BROKEN_arm="1"
-
-# On ARM I got:
-#
-# tables.c: In function `yytbl_write16':
-# tables.c:313: internal compiler error: in arm_print_operand, at config/arm/arm.c:11410
-
 include flex.inc
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://include.patch;patch=1"