diff options
| author | Alexander Larsson <alexl@redhat.com> | 2015-09-04 11:54:23 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2015-09-04 11:54:23 +0200 |
| commit | 87cdc9cb901f19c0398c5f27998e915fa49d9d93 (patch) | |
| tree | 249b4bc43c71ec45a9fbb72cf2827248ec62446c | |
| parent | cda42b256f1691e750bce3a421a4fe6536115ac3 (diff) | |
Backport fixes for python sysconfigdata
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/recipes-devtools/python?id=3e6a5af02fe6059e5256010d9b2be5e63d2147b6
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/recipes-devtools/python?id=b5c66750fe1f940c6f2bd09efb1130ca058f0f1a
| -rw-r--r-- | meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend | 9 | ||||
| -rw-r--r-- | meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend b/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend index 80586b7..4789ec5 100644 --- a/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend +++ b/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend @@ -10,3 +10,12 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI += "\ file://999-distutils-fix-unset-env.patch \ " + +py_package_preprocess () { + # copy back the old Makefile to fix target package + install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile + # 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 \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py +} diff --git a/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend b/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend new file mode 100644 index 0000000..61477d2 --- /dev/null +++ b/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend @@ -0,0 +1,9 @@ +py_package_preprocess () { + # copy back the old Makefile to fix target package + install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile + + # 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 \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py +} |