python-core/python-dev: improve reproducibility

- Remove remaining build host references from packaged files.
  (sync with python3)

- Use relative path to recompile _sysconfigdata.py

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/python/python_2.7.14.bb b/meta/recipes-devtools/python/python_2.7.14.bb
index 7d03bc8a64dcfb2bdc3f4b9eab8c3629c5edd49b..0a09926dfba295cffa9c4aaee516fdba224738da 100644 (file)
--- a/meta/recipes-devtools/python/python_2.7.14.bb
+++ b/meta/recipes-devtools/python/python_2.7.14.bb
@@ -141,9 +141,14 @@ 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 \
+               -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' \
                ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
                ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
-    python -m py_compile ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
+       (cd ${PKGD}; python -m py_compile ./${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py)
 }