flex: update to 2.6.0

Drop backported 0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch

Test cases have been completely rearranged upstream, so ptest support
is fully rewritten.

Merge split bb/inc as there's no other user of the .inc [RB]

As automake insists adding BUILD_SOURCES as a dependency to the "all" target,
remove tests/ from the build unless ptests are enabled.  This means native
builds don't need a bison dependency. If ptests are enabled, we build-depend on
flex-native and bison-native for the test suite, and tell it to use the
flex-native binary instead of attempting to run the cross flex it just
built. [RB]

Move in-tree files from files/ to flex/ for consistency. [RB]

(From OE-Core rev: 4fe048b7b32eb3d20a43171b83e8ad2037192d34)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 45 deletions

diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
deleted file mode 100644
index fbe921bfbe..0000000000
--- a/meta/recipes-devtools/flex/flex.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Flex (The Fast Lexical Analyzer)"
-DESCRIPTION = "Flex is a fast lexical analyser generator.  Flex is a tool for generating programs that recognize \
-lexical patterns in text."
-HOMEPAGE = "http://sourceforge.net/projects/flex/"
-
-SECTION = "devel"
-LICENSE = "BSD"
-DEPENDS += "${@'bison-native flex-native' if '${PTEST_ENABLED}' == '1' else ''}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
-           file://0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch \
-           file://run-ptest \
-"
-
-inherit autotools gettext texinfo ptest
-
-
-M4 = "${bindir}/m4"
-M4_class-native = "${STAGING_BINDIR_NATIVE}/m4"
-
-EXTRA_OECONF += "ac_cv_path_M4=${M4}"
-EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4"
-
-do_install_append_class-native() {
-        create_wrapper ${D}/${bindir}/flex M4=${M4}
-}
-
-do_install_append_class-nativesdk() {
-        create_wrapper ${D}/${bindir}/flex M4=${M4}
-}
-
-RDEPENDS_${PN} += "m4"
-
-do_compile_ptest() {
-        for i in `find ${S}/tests/ -type d |grep -Ev "concatenated-options|reject|table-opts" | awk -F/ '{print $NF}'`; \
-          do oe_runmake -C ${S}/tests/$i -f ${B}/tests/$i/Makefile top_builddir=${B} FLEX=flex $i; \
-        done
-        oe_runmake -C ${S}/tests/test-reject -f ${B}/tests/test-reject/Makefile top_builddir=${B} FLEX=flex test-reject-nr test-reject-r test-reject-ser test-reject-ver
-}
-
-do_install_ptest() {
-        for i in `find ${S}/tests/ -type d | awk -F/ '{print $NF}'`; \
-          do cp -r ${S}/tests/$i ${D}${PTEST_PATH}; \
-        done
-}