From fe66f95ae2edae739bb1581a933ae70d5cc6f6c5 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Tue, 23 Jan 2024 09:09:42 +0100 Subject: [PATCH] arm-compute-library: Override do_configure scons.bbclass sets both 'PREFIX' and 'prefix' variables upon configure call, resulting in a configure error: Unknown variables: PREFIX prefix Fix this error message by going the same way as do_compile, copying the class code and remove setting these variables. Signed-off-by: Alexander Stein --- .../arm-compute-library/arm-compute-library_22.05.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes-libraries/arm-compute-library/arm-compute-library_22.05.bb b/recipes-libraries/arm-compute-library/arm-compute-library_22.05.bb index 4a234e4..d91a967 100644 --- a/recipes-libraries/arm-compute-library/arm-compute-library_22.05.bb +++ b/recipes-libraries/arm-compute-library/arm-compute-library_22.05.bb @@ -38,6 +38,18 @@ EXTRA_OESCONS:append:aarch64 = " arch=arm64-v8a neon=1" TARGET_CC_ARCH += "${LDFLAGS}" +# Override scons_do_configure which includes unknown variables PREFIX and prefix +do_configure() { + if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then + if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean ${EXTRA_OESCONS} + fi + + mkdir -p `dirname ${CONFIGURESTAMPFILE}` + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi +} + # Override scons_do_compile which includes unknown variables PREFIX and prefix do_compile() { ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} ${EXTRA_OESCONS} || \