]> code.ossystems Code Review - openembedded-core.git/commitdiff
flex: Replace uninative loader path
authorJoshua Watt <jpewhacker@gmail.com>
Sun, 8 Dec 2019 20:18:48 +0000 (14:18 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 9 Dec 2019 11:56:41 +0000 (11:56 +0000)
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 <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/flex/flex_2.6.4.bb

index d8e2f7f28c2b4ff9612298194c1f944303d6d038..43b2547fc69c21361c966dbe6189fb07dd19636b 100644 (file)
@@ -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"