[oe-commits] org.oe.dev distutils.bbclass : make the arguments passed to setup.py variables to allow customisation

[jeremy_laine commit]

distutils.bbclass : make the arguments passed to setup.py variables to allow customisation

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: d269cb51c3334604c79fa4f9066d1b4bcff3e75a
ViewMTN: http://monotone.openembedded.org/revision/info/d269cb51c3334604c79fa4f9066d1b4bcff3e75a
Files:
1
classes/distutils.bbclass
Diffs:

#
# mt diff -re8ed5207d499af15d44fc6bf057d0b89769cf10f -rd269cb51c3334604c79fa4f9066d1b4bcff3e75a
#
# 
# 
# patch "classes/distutils.bbclass"
#  from [09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa]
#    to [41980eec92cf67538cc2af843af8a2424a084a31]
# 
============================================================
--- classes/distutils.bbclass	09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa
+++ classes/distutils.bbclass	41980eec92cf67538cc2af843af8a2424a084a31
@@ -1,5 +1,11 @@ inherit distutils-base
 inherit distutils-base
 
+DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
+DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \
+    --install-data=${STAGING_DATADIR}"
+DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
+    --install-data=${D}/${datadir}"
+
 distutils_do_compile() {
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/python setup.py build || \
@@ -8,7 +14,7 @@ distutils_stage_headers() {
 
 distutils_stage_headers() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         oefatal "python setup.py install_headers execution failed."
 }
 
@@ -16,7 +22,7 @@ distutils_stage_all() {
         install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
         PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         oefatal "python setup.py install (stage) execution failed."
 }
 
@@ -24,7 +30,7 @@ distutils_do_install() {
         install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
         PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
         oefatal "python setup.py install execution failed."
 
         for i in `find ${D} -name "*.py"` ; do \