diff options
| author | Morgan Little <morgan.little@windriver.com> | 2012-07-19 13:46:06 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-22 11:40:07 +0100 |
| commit | a2e554f731437545e9483a7a73e6847c03f6f48a (patch) | |
| tree | 16a72d2bee1d5eabfec52a4c606e4f18f295e20f /meta/classes | |
| parent | f8a87fd585fc199a7c7cff81d11fdc35b16cf3d2 (diff) | |
| download | openembedded-core-a2e554f731437545e9483a7a73e6847c03f6f48a.tar.gz openembedded-core-a2e554f731437545e9483a7a73e6847c03f6f48a.tar.bz2 openembedded-core-a2e554f731437545e9483a7a73e6847c03f6f48a.zip | |
python-native: Put binaries in seperate directory
Update python-native to install the binaries in the python-native directory,
add pythonnative.bbclass to let recipes that need python-native use the
binaries and update disutils access the new binaries. Update distutils-base
to inherit pythonnative.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/distutils-base.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/distutils.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/pythonnative.bbclass | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass index 6d18e08f14..c761b3602b 100644 --- a/meta/classes/distutils-base.bbclass +++ b/meta/classes/distutils-base.bbclass @@ -1,5 +1,5 @@ DEPENDS += "${@["python-native python", ""][(d.getVar('PACKAGES', True) == '')]}" RDEPENDS_${PN} += "${@['', 'python-core']['${PN}' == '${BPN}']}" -inherit distutils-common-base +inherit distutils-common-base pythonnative diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index bcddf8d978..690df73717 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -11,14 +11,14 @@ distutils_do_compile() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ bbfatal "python setup.py build_ext execution failed." } distutils_stage_headers() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ bbfatal "python setup.py install_headers execution failed." } @@ -28,7 +28,7 @@ distutils_stage_all() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ bbfatal "python setup.py install (stage) execution failed." } @@ -38,7 +38,7 @@ distutils_do_install() { STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ bbfatal "python setup.py install execution failed." for i in `find ${D} -name "*.py"` ; do \ diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass new file mode 100644 index 0000000000..bc346da58d --- /dev/null +++ b/meta/classes/pythonnative.bbclass @@ -0,0 +1,3 @@ +PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" +PATH_prepend = "${STAGING_BINDIR_NATIVE}/python-native:" +DEPENDS += " python-native " |