diff options
-rw-r--r-- | meta/recipes-devtools/flex/flex/disable-tests.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/flex/flex_2.6.4.bb | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-devtools/flex/flex/disable-tests.patch b/meta/recipes-devtools/flex/flex/disable-tests.patch deleted file mode 100644 index 4dc801d72c..0000000000 --- a/meta/recipes-devtools/flex/flex/disable-tests.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
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_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index 2236b2bc6a..434ce47c03 100644 --- a/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb | |||
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067 \ | |||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/flex-${PV}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/flex-${PV}.tar.gz \ |
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ | 17 | file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ |
18 | ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \ | ||
19 | file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ | 18 | file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ |
20 | file://check-funcs.patch \ | 19 | file://check-funcs.patch \ |
21 | file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \ | 20 | file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \ |