[oe-commits] [openembedded-core] 11/22: python: move make override variables to EXTRA_OEMAKE
git at git.openembedded.org
git at git.openembedded.org
Fri Nov 29 17:44:14 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit c4ae09134732e4e95f17d6e572756bec49a9e3d0
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Nov 26 09:09:07 2019 +0000
python: move make override variables to EXTRA_OEMAKE
Instead of passing the same five variables to oe_runmake repeatedly, add them to
EXTRA_OEMAKE once.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-devtools/python/python_2.7.17.bb | 31 +++++++++------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb
index 6199a5d..ef5d564 100644
--- a/meta/recipes-devtools/python/python_2.7.17.bb
+++ b/meta/recipes-devtools/python/python_2.7.17.bb
@@ -45,7 +45,13 @@ PACKAGECONFIG[bdb] = ",,db"
PACKAGECONFIG[tk] = ",,tk"
# pgen isn't needed in the current build, but use the binary from python-native just in case.
-EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen"
+EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
+ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
+ "
do_configure_append() {
rm -f ${S}/Makefile.orig
@@ -85,12 +91,7 @@ do_compile() {
export CROSS_COMPILE="${TARGET_PREFIX}"
export PYTHONBUILDDIR="${B}"
- oe_runmake \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
- OPT="${CFLAGS}"
+ oe_runmake OPT="${CFLAGS}"
}
do_install() {
@@ -103,21 +104,9 @@ do_install() {
# After swizzling the makefile, we need to run the build again.
# install can race with the build so we have to run this first, then install
- oe_runmake \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
- CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
- DESTDIR=${D} LIBDIR=${libdir}
+ oe_runmake DESTDIR=${D} LIBDIR=${libdir}
- oe_runmake \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
- CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
- STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
- DESTDIR=${D} LIBDIR=${libdir} install
+ oe_runmake DESTDIR=${D} LIBDIR=${libdir} install
install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list