diff options
-rw-r--r-- | meta/packages/flex/flex-native_2.5.31.bb | 10 | ||||
-rw-r--r-- | meta/packages/flex/flex.inc | 3 | ||||
-rw-r--r-- | meta/packages/flex/flex/fix-gen.patch (renamed from meta/packages/flex/files/fix-gen.patch) | 0 | ||||
-rw-r--r-- | meta/packages/flex/flex/flex-lvalue.diff (renamed from meta/packages/flex/files/flex-lvalue.diff) | 0 | ||||
-rw-r--r-- | meta/packages/flex/flex_2.5.31.bb | 7 |
5 files changed, 3 insertions, 17 deletions
diff --git a/meta/packages/flex/flex-native_2.5.31.bb b/meta/packages/flex/flex-native_2.5.31.bb deleted file mode 100644 index 1e9354afd..000000000 --- a/meta/packages/flex/flex-native_2.5.31.bb +++ /dev/null @@ -1,10 +0,0 @@ -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/meta/packages/flex/flex.inc b/meta/packages/flex/flex.inc index 048b3cb47..0e8bf76e7 100644 --- a/meta/packages/flex/flex.inc +++ b/meta/packages/flex/flex.inc @@ -5,7 +5,6 @@ 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 +inherit autotools_stage diff --git a/meta/packages/flex/files/fix-gen.patch b/meta/packages/flex/flex/fix-gen.patch index 55f4f6fdf..55f4f6fdf 100644 --- a/meta/packages/flex/files/fix-gen.patch +++ b/meta/packages/flex/flex/fix-gen.patch diff --git a/meta/packages/flex/files/flex-lvalue.diff b/meta/packages/flex/flex/flex-lvalue.diff index 56ae539a6..56ae539a6 100644 --- a/meta/packages/flex/files/flex-lvalue.diff +++ b/meta/packages/flex/flex/flex-lvalue.diff diff --git a/meta/packages/flex/flex_2.5.31.bb b/meta/packages/flex/flex_2.5.31.bb index 3062e2d8d..7ca7c7ee3 100644 --- a/meta/packages/flex/flex_2.5.31.bb +++ b/meta/packages/flex/flex_2.5.31.bb @@ -1,9 +1,6 @@ require flex.inc -PR = "r4" +PR = "r5" SRC_URI += "file://include.patch;patch=1" -do_stage() { - oe_libinstall -a libfl ${STAGING_LIBDIR} -} - +BBCLASSEXTEND = "native" |