From 54441215bdac4ac3bde1b009b27194edcf7f8147 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 16 Mar 2024 15:43:22 +0000 Subject: bash/flex: Ensure BUILD_FLAGS doesn't leak onto target The ptest packages were leaking BUILD_LDFLAGS into the Makefile used on target. Remove these values instead. (From OE-Core rev: 599132c7794a1192ddd257669798a3ec6d1191bb) Signed-off-by: Richard Purdie --- meta/recipes-devtools/flex/flex_2.6.4.bb | 1 + meta/recipes-extended/bash/bash.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-devtools/flex/flex_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index 1ac88d65ef..f7d4ef1f08 100644 --- a/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -68,6 +68,7 @@ do_install_ptest() { sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's|${DEBUG_PREFIX_MAP}||g' \ -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:\(^LDFLAGS_FOR_BUILD =\).*:\1:g' \ -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \ -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \ diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 2c3e605511..7832ad052b 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -102,6 +102,7 @@ do_install_ptest () { install -D ${WORKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's|${BUILD_LDFLAGS}||g' \ -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \ -e 's:${HOSTTOOLS_DIR}/::g' \ -e 's:${UNINATIVE_LOADER}:${base_bindir}/false:g' \ -- cgit v1.2.3-54-g00ecf