From: Li Zhou <li.zhou@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH] python2/3: Remove building host path from packages
Date: Tue, 11 Apr 2017 16:03:48 +0800 [thread overview]
Message-ID: <1491897828-50233-1-git-send-email-li.zhou@windriver.com> (raw)
Remove building host related path from python2 and python3 packages.
Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
meta/recipes-devtools/python/python3_3.5.2.bb | 8 +++++++-
meta/recipes-devtools/python/python_2.7.13.bb | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3_3.5.2.bb b/meta/recipes-devtools/python/python3_3.5.2.bb
index 2ff7c9e..ca8dfe3 100644
--- a/meta/recipes-devtools/python/python3_3.5.2.bb
+++ b/meta/recipes-devtools/python/python3_3.5.2.bb
@@ -185,9 +185,15 @@ py_package_preprocess () {
install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}/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 \
+ -e 's:${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig:${datadir}/pkgconfig:g' \
+ -e 's:${STAGING_DIR_NATIVE}::g' \
+ -e 's:${STAGING_DIR_HOST}::g' \
+ -e 's:${WORKDIR}::g' \
+ -e 's:${TMPDIR}::g' \
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}/Makefile \
- ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
+ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py \
+ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}${PYTHON_ABI}-config
}
require python-${PYTHON_MAJMIN}-manifest.inc
diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb
index 4ef9952..b4bde5f 100644
--- a/meta/recipes-devtools/python/python_2.7.13.bb
+++ b/meta/recipes-devtools/python/python_2.7.13.bb
@@ -131,7 +131,13 @@ 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:${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig:${datadir}/pkgconfig:g' \
+ -e 's:${STAGING_DIR_NATIVE}::g' \
+ -e 's:${STAGING_DIR_HOST}::g' \
+ -e 's:${WORKDIR}::g' \
+ -e 's:${TMPDIR}::g' \
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
+ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/config.c \
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
python -m py_compile ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
}
--
1.9.1
next reply other threads:[~2017-04-11 8:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 8:03 Li Zhou [this message]
2017-04-11 15:44 ` [PATCH] python2/3: Remove building host path from packages Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491897828-50233-1-git-send-email-li.zhou@windriver.com \
--to=li.zhou@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox