diff mbox series

[2/3] python3: conslidate sysconfigdata cleanup

Message ID 20261030173010.4102708-2-ross.burton@arm.com
State New
Headers show
Series [1/3] python3: clean up recompilation of sysconfigdata.py | expand

Commit Message

Ross Burton Oct. 30, 2026, 5:30 p.m. UTC 
There's no need to have two almost-identical blocks for removing build
references from the Python and JSON representations of the same data.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/python/python3_3.14.10.bb | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3_3.14.10.bb b/meta/recipes-devtools/python/python3_3.14.10.bb
index d6e84e782a2..81da730c0c0 100644
--- a/meta/recipes-devtools/python/python3_3.14.10.bb
+++ b/meta/recipes-devtools/python/python3_3.14.10.bb
@@ -366,7 +366,8 @@  PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
 
 py_package_preprocess () {
         # Remove references to buildmachine paths in target Makefile and _sysconfigdata
-        sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
+        sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \
+                -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
                 -e 's|${DEBUG_PREFIX_MAP}||g' \
                 -e 's:${HOSTTOOLS_DIR}/::g' \
                 -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
@@ -375,8 +376,10 @@  py_package_preprocess () {
                 -e 's:BUILD_GNU_TYPE\(.*\)=\(.*\)[a-z\-]*:BUILD_GNU_TYPE\1=\2${HOST_SYS}:g' \
                 -e 's:build_alias=${BUILD_ARCH}:build_alias=${HOST_ARCH}:g' \
                 -e 's:--build=${BUILD_ARCH}:--build=${HOST_ARCH}:g' \
+                -e 's|"userbase": ".*"|"userbase": ""|g' \
                 ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \
                 ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \
+                ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfig_vars*.json \
                 ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config
 
         # Reformat and recompile _sysconfigdata after modifying it so that it remains
@@ -391,18 +394,6 @@  py_package_preprocess () {
         #Remove the unneeded copy of target sysconfig data
         rm -rf ${PKGD}/${libdir}/python-sysconfigdata
 
-	# Remove references to buildpaths in _sysconfig_vars JSON files
-        sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
-                -e 's|${DEBUG_PREFIX_MAP}||g' \
-                -e 's:${HOSTTOOLS_DIR}/::g' \
-                -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
-                -e 's:${RECIPE_SYSROOT}::g' \
-                -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
-                -e 's:build_alias=${BUILD_ARCH}:build_alias=${HOST_ARCH}:g' \
-                -e 's:--build=${BUILD_ARCH}:--build=${HOST_ARCH}:g' \
-                -e 's|"userbase": ".*"|"userbase": ""|g' \
-		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfig_vars*.json
-
         # Fix extensions in build-details.json
         sed -i -e 's:${BUILD_ARCH}-${HOST_OS}:${HOST_ARCH}-${HOST_OS}:g' ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/build-details.json
 }