From: Ross Burton Date: Wed, 26 Mar 2025 12:11:49 +0000 (+0000) Subject: flex: remove obsolete disable-tests.patch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e8a2831abcb9edd352fcdc6d1f3be0670b1242;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git flex: remove obsolete disable-tests.patch We added this because automake was causing things to be built, but now this doesn't seem to be the case: all: all-am all-am: Makefile $(SCRIPTS) SCRIPTS = $(dist_noinst_SCRIPTS) dist_noinst_SCRIPTS = tableopts.sh tableopts.sh is a source file that is both in the tarballs and git. Thus, remove the patch. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 4dc801d72c3..00000000000 --- a/meta/recipes-devtools/flex/flex/disable-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Due to automake stupidity the Makefile in tests/ has an 'all' target that -depends on $(BUILD_SOURCES), which means when building flex parts of the test -suite are built even if they're not needed, resulting in flex needing -flex-native and bison-native to build. - -This patch removes the tests directory from SUBDIRS and will be conditionally -applied by the recipe. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -diff --git a/Makefile.am b/Makefile.am -index 076ccad..0574d7b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -55,3 +55,2 @@ SUBDIRS = \ - po \ -- tests \ - tools diff --git a/meta/recipes-devtools/flex/flex_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index 2236b2bc6a5..434ce47c03a 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 \ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/flex-${PV}.tar.gz \ file://run-ptest \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \ file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ file://check-funcs.patch \ file://0001-Emit-no-line-directives-if-gen_line_dirs-is-false.patch \