From b29c66484a9e0532e9e11e1c21be6c3e7eefae8c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 9 Nov 2022 21:21:08 +0100 Subject: [PATCH] python3: correctly adjust include paths in sysconfigdata This was replacing /usr/include regardless of whether it was at the beginning of the full path (correct, when building target python3), or in the middle of it (not correct, when building native or nativesdk python). Through various reasons we haven't been bitten by this until now, but latest setuptools does expose the problem with for example nativesdk-python3-cffi and nativesdk-python3-cryptography which both fail without this fix. I am not aware of anything using INCLDIRSTOMAKE, and it is harder to adjust correctly due to the value being a list; if something is using it, we can look at it specifically. (From OE-Core rev: 4055dd6cc89af16b3723e38b63d4d81efb0e2286) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3_3.11.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3_3.11.0.bb b/meta/recipes-devtools/python/python3_3.11.0.bb index 6b6c983abf..92a1f69320 100644 --- a/meta/recipes-devtools/python/python3_3.11.0.bb +++ b/meta/recipes-devtools/python/python3_3.11.0.bb @@ -186,8 +186,8 @@ do_install:append() { -e "s,^ 'LIBDIR'.*, 'LIBDIR': '${STAGING_LIBDIR}'\,,g" \ -e "s,^ 'INCLUDEDIR'.*, 'INCLUDEDIR': '${STAGING_INCDIR}'\,,g" \ -e "s,^ 'CONFINCLUDEDIR'.*, 'CONFINCLUDEDIR': '${STAGING_INCDIR}'\,,g" \ - -e "/^ 'INCLDIRSTOMAKE'/{N; s,/usr/include,${STAGING_INCDIR},g}" \ - -e "/^ 'INCLUDEPY'/s,/usr/include,${STAGING_INCDIR},g" \ + -e "s,^ 'INCLUDEPY'.*, 'INCLUDEPY': '${STAGING_INCDIR}/python${PYTHON_MAJMIN}'\,,g" \ + -e "s,^ 'CONFINCLUDEPY'.*, 'CONFINCLUDEPY': '${STAGING_INCDIR}/python${PYTHON_MAJMIN}'\,,g" \ -e "s,${B},/build/path/unavailable/,g" \ $sysconfigfile cp $sysconfigfile ${D}${libdir}/python-sysconfigdata/_sysconfigdata.py