diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-12-08 14:18:48 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 12:00:43 +0000 |
commit | bbd9f784fbee8ab1cac94a3bfd6749fc0d142691 (patch) | |
tree | 101c065d1c4fe3df4b1f59e8ccdb6276cf0ce259 /meta/recipes-devtools/flex | |
parent | f52451b71910bc759c2bf06e3cf732487298797f (diff) | |
download | poky-bbd9f784fbee8ab1cac94a3bfd6749fc0d142691.tar.gz |
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.
(From OE-Core rev: 3cce2d1c36b0859186139d650fd50d2a56e91abd)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/flex')
-rw-r--r-- | meta/recipes-devtools/flex/flex_2.6.4.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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() { | |||
64 | -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \ | 64 | -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \ |
65 | -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \ | 65 | -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \ |
66 | -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \ | 66 | -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \ |
67 | -e 's:${UNINATIVE_LOADER}:${base_bindir}/false:g' \ | ||
67 | -i ${D}${PTEST_PATH}/Makefile | 68 | -i ${D}${PTEST_PATH}/Makefile |
68 | } | 69 | } |
70 | # The uninative loader is different on i386 & x86_64 hosts. Since it is only | ||
71 | # being replaced with /bin/false anyway, it doesn't need to be part of the task | ||
72 | # hash | ||
73 | do_install_ptest[vardepsexclude] += "UNINATIVE_LOADER" | ||
69 | 74 | ||
70 | # Not Apache Flex, or Adobe Flex, or IBM Flex. | 75 | # Not Apache Flex, or Adobe Flex, or IBM Flex. |
71 | CVE_PRODUCT = "flex_project:flex" | 76 | CVE_PRODUCT = "flex_project:flex" |