diff options
| author | Matthew McClintock <msm@freescale.com> | 2012-08-21 13:44:21 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-22 14:22:55 +0100 |
| commit | c7cfe7759e4816d870595e901496ae53e0452726 (patch) | |
| tree | 5384d4e772cfd58387822211312131718c2f991e /meta | |
| parent | d15f1265015f47e122ca3eed713037b36f600a42 (diff) | |
| download | poky-c7cfe7759e4816d870595e901496ae53e0452726.tar.gz | |
distutils.bblass: change order of args to install step
This let's the user override install-lib argument again if it needs
to be something else, otherwise things like python-setuptools
won't be able to modify the install-lib dir
This fixes a new issue exposed by my previous distutils patch
that fixed the python modules default install location. Also,
it removes running the install step twice which was inadvertant
(From OE-Core rev: 3b23feca31480cc56f55301fd0274e622c40b522)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/distutils.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 7588b81542..52a1aa8749 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass | |||
| @@ -38,8 +38,7 @@ distutils_do_install() { | |||
| 38 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 38 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
| 39 | PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ | 39 | PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ |
| 40 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | 40 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ |
| 41 | ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ | 41 | ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS} || \ |
| 42 | ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} --install-lib=${D}${libdir}/${PYTHON_DIR} || \ | ||
| 43 | bbfatal "python setup.py install execution failed." | 42 | bbfatal "python setup.py install execution failed." |
| 44 | 43 | ||
| 45 | for i in `find ${D} -name "*.py"` ; do \ | 44 | for i in `find ${D} -name "*.py"` ; do \ |