Skip to content

Commit

Permalink
distutils: Fix STAGING_{INC,LIB}DIR for setup.py
Browse files Browse the repository at this point in the history
install(1) does not use STAGING_{INC,LIB}DIR, so it seems these
invocations of install(1) were added at this location in error. Fix this
by moving the install(1) call to the top and defining the
STAGING_{INC,LIB}DIR variables for setup.py.

Signed-off-by: Clemens Lang <clemens.lang@bmw-carit.de>
  • Loading branch information
Clemens Lang committed Nov 22, 2016
1 parent 9615b1d commit d78c078
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion meta/classes/distutils-tools.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ distutils_stage_headers() {
}

distutils_stage_all() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
Expand Down
2 changes: 1 addition & 1 deletion meta/classes/distutils.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ distutils_stage_headers() {
}

distutils_stage_all() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
Expand Down
2 changes: 1 addition & 1 deletion meta/classes/distutils3.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ distutils3_stage_headers() {
distutils3_stage_headers[vardepsexclude] = "MACHINE"

distutils3_stage_all() {
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
Expand Down

0 comments on commit d78c078

Please sign in to comment.