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/disable-tests.patch | |
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/disable-tests.patch')
-rw-r--r-- | meta/recipes-devtools/flex/flex/disable-tests.patch | 19 |
1 files changed, 19 insertions, 0 deletions
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 | ||