From d72eea5a5d3d6bf15251471929c984eb6e864df8 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Tue, 21 Aug 2012 13:38:11 -0500 Subject: 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 (From OE-Core rev: 0fd7b7dd361e59c687366480cd9f89c81c2e5bce) Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- meta/classes/distutils.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 67ad5b3416..ec471babd7 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -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} --install-lib=${D}${libdir}/${PYTHON_DIR} || \ + ${STAGING_BINDIR_NATIVE}/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS}|| \ bbfatal "python setup.py install execution failed." for i in `find ${D} -name "*.py"` ; do \ -- cgit v1.2.3-54-g00ecf