diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-15 13:59:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-22 16:08:51 +0000 |
commit | 86c8b8b82e39ca4233ef0ae258dc0cb18734151c (patch) | |
tree | d47c506f3f0719e5818349f3fecfd5a34144ba2f /meta/recipes-devtools/flex/flex | |
parent | dad130b76493429b6dc1de436cb758cd1735f808 (diff) | |
download | poky-86c8b8b82e39ca4233ef0ae258dc0cb18734151c.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/flex/flex')
4 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch new file mode 100644 index 0000000000..556c240b24 --- /dev/null +++ b/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From b4aa18d939fc0c8825fa584dfcee1a7da61099cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 10 Dec 2015 16:09:26 +0200 | ||
4 | Subject: [PATCH] tests: add a target for building tests without running them | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | tests/Makefile.am | 3 +++ | ||
10 | 1 file changed, 3 insertions(+) | ||
11 | |||
12 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
13 | index 4ac3c17..0025cfe 100644 | ||
14 | --- a/tests/Makefile.am | ||
15 | +++ b/tests/Makefile.am | ||
16 | @@ -21,6 +21,9 @@ | ||
17 | |||
18 | TESTS = $(check_PROGRAMS) options.cn | ||
19 | |||
20 | +# This allows building tests without running them | ||
21 | +buildtests: $(TESTS) | ||
22 | + | ||
23 | # The script testwrapper.sh will run most tests as is. A couple tests | ||
24 | # in the suite end in .reject, .table and the like so that we can pass | ||
25 | # different arguments to the test runner. We list those extensions so | ||
26 | -- | ||
27 | 2.6.2 | ||
28 | |||
diff --git a/meta/recipes-devtools/flex/flex/disable-tests.patch b/meta/recipes-devtools/flex/flex/disable-tests.patch new file mode 100644 index 0000000000..4dc801d72c --- /dev/null +++ b/meta/recipes-devtools/flex/flex/disable-tests.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Due to automake stupidity the Makefile in tests/ has an 'all' target that | ||
2 | depends on $(BUILD_SOURCES), which means when building flex parts of the test | ||
3 | suite are built even if they're not needed, resulting in flex needing | ||
4 | flex-native and bison-native to build. | ||
5 | |||
6 | This patch removes the tests directory from SUBDIRS and will be conditionally | ||
7 | applied by the recipe. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
11 | |||
12 | diff --git a/Makefile.am b/Makefile.am | ||
13 | index 076ccad..0574d7b 100644 | ||
14 | --- a/Makefile.am | ||
15 | +++ b/Makefile.am | ||
16 | @@ -55,3 +55,2 @@ SUBDIRS = \ | ||
17 | po \ | ||
18 | - tests \ | ||
19 | tools | ||
diff --git a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch new file mode 100644 index 0000000000..032833ae7a --- /dev/null +++ b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Inappropriate (embedded specific) | ||
2 | |||
3 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
4 | |||
5 | Index: flex-2.5.37/doc/Makefile.am | ||
6 | =================================================================== | ||
7 | --- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300 | ||
8 | +++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 | ||
9 | @@ -2,7 +2,7 @@ | ||
10 | |||
11 | info_TEXINFOS = flex.texi | ||
12 | dist_man_MANS = flex.1 | ||
13 | -dist_doc_DATA= flex.pdf | ||
14 | +EXTRA_DIST= flex.pdf | ||
15 | |||
16 | CLEANFILES = \ | ||
17 | flex.hks \ | ||
diff --git a/meta/recipes-devtools/flex/flex/run-ptest b/meta/recipes-devtools/flex/flex/run-ptest new file mode 100755 index 0000000000..19db337900 --- /dev/null +++ b/meta/recipes-devtools/flex/flex/run-ptest | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # make would want to rebuild some files with a compiler otherwise :-/ | ||
4 | make FLEX=/usr/bin/flex -t check-TESTS || true | ||
5 | make FLEX=/usr/bin/flex check-TESTS | ||