From 3cce2d1c36b0859186139d650fd50d2a56e91abd Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Sun, 8 Dec 2019 14:18:48 -0600 Subject: flex: Replace uninative loader path The Makefile used for flex-ptest can pick up the path to the uninative loader through BUILD_LDFLAGS. This includes the full path to the uninative loader, which is not reproducible. Replace it with /bin/false. It doesn't appear as if these native programs are used in the test suites and if there are likely to be other problems related to building them using the BUILD_* flags. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/recipes-devtools/flex/flex_2.6.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/flex/flex_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index d8e2f7f28c..43b2547fc6 100644 --- a/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -64,8 +64,13 @@ do_install_ptest() { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \ -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \ -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \ + -e 's:${UNINATIVE_LOADER}:${base_bindir}/false:g' \ -i ${D}${PTEST_PATH}/Makefile } +# The uninative loader is different on i386 & x86_64 hosts. Since it is only +# being replaced with /bin/false anyway, it doesn't need to be part of the task +# hash +do_install_ptest[vardepsexclude] += "UNINATIVE_LOADER" # Not Apache Flex, or Adobe Flex, or IBM Flex. CVE_PRODUCT = "flex_project:flex" -- cgit 1.2.3-korg