diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-06-07 18:12:58 +0000 |
|---|---|---|
| committer | John Bowler <jbowler@nslu2-linux.org> | 2005-06-07 18:12:58 +0000 |
| commit | 6df171ed659aa21947821f2a5b8c5af96b69e8d6 (patch) | |
| tree | eba41f8408a5b2386b50e2a8c2f6f87a6c41075f /packages/flex | |
| parent | 4edd256d6e63ac02dcad309ff8b83d0f02cdaf59 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into marsco.kalmiopsis:/home/nslu2/openembedded
2005/06/07 16:00:28+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/06/07 16:00:10+02:00 uni-frankfurt.de!mickeyl
wireless tools: package libiw (again)
2005/06/07 15:49:41+02:00 utwente.nl!koen
documentation.conf: typo--
2005/06/07 14:00:41+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/06/07 14:00:25+02:00 utwente.nl!koen
gkdial_1.8.1.bb: point SRC_URI to the hh.org sourcemirror. ~lart disappearing sources
2005/06/07 13:49:20+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded
2005/06/07 13:48:31+02:00 hrw.one.pl!hrw
flex: unbreak non-native build, mark BROKEN on arm
2005/06/07 11:50:45+02:00 mn-solutions.de!schurig
wpa-supplicant_cvs.bb: fix path for the defaults
2005/06/07 10:24:03+02:00 mn-solutions.de!schurig
Fixes the "TypeError: cannot concatenate 'str' and 'NoneType' objects" we got for packages like atd, dbus etc in update-rc.d.bbclass.
Thanks do13
BKrev: 42a5e3aaLki5_YPl8KJqM8Qwgk5q4w
Diffstat (limited to 'packages/flex')
| -rw-r--r-- | packages/flex/flex-native_2.5.31.bb | 9 | ||||
| -rw-r--r-- | packages/flex/flex.inc | 8 | ||||
| -rw-r--r-- | packages/flex/flex_2.5.31.bb | 9 |
3 files changed, 17 insertions, 9 deletions
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb index 28dcda51d2..fa125d6be7 100644 --- a/packages/flex/flex-native_2.5.31.bb +++ b/packages/flex/flex-native_2.5.31.bb @@ -1,4 +1,11 @@ include flex.inc inherit native -PR = "r0" +PR = "r1" + +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/packages/flex/flex.inc b/packages/flex/flex.inc index 41beef3245..8f84eb1996 100644 --- a/packages/flex/flex.inc +++ b/packages/flex/flex.inc @@ -5,11 +5,5 @@ LICENSE = "BSD" SRC_URI = "http://mesh.dl.sf.net/lex/flex-2.5.31.tar.bz2" S = "${WORKDIR}/flex-${PV}" -inherit native autotools +inherit autotools -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/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb index b7c316fb1b..8349355b89 100644 --- a/packages/flex/flex_2.5.31.bb +++ b/packages/flex/flex_2.5.31.bb @@ -1,2 +1,9 @@ +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 = "r0" +PR = "r1" |