[oe-commits] [openembedded-core] 34/44: distutils/distutils3: do not try to fetch code during do_configure

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b21c72176f3d7f026c02e5aae4ab4234a4f1592b
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Thu Jul 26 22:50:21 2018 +0800

    distutils/distutils3: do not try to fetch code during do_configure
    
    For distutils3, any setup.py invoking will cause setup_requires
    argument to trigger a code fetching. Since the following commit
    applied in oe-core, code fetching occurs during do_confugire
    before the do_compile.
    ...
    b805cef distutils: clean the build tree in do_configure
    ...
    
    Refer what do_compile did, add var-NO_FETCH_BUILD to do_configure.
    
    Sync with distutils3, add do_configure to distutils also.
    
    [YOCTO #12084]
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/distutils.bbclass  | 9 ++++++++-
 meta/classes/distutils3.bbclass | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 3cf1d6b..e7d48ab 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -9,6 +9,13 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \
     --install-lib=${PYTHON_SITEPACKAGES_DIR} \
     --install-data=${datadir}"
 
+distutils_do_configure() {
+        if [ "${CLEANBROKEN}" != "1" ] ; then
+                NO_FETCH_BUILD=1 \
+                ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS}
+        fi
+}
+
 distutils_do_compile() {
          NO_FETCH_BUILD=1 \
          STAGING_INCDIR=${STAGING_INCDIR} \
@@ -80,6 +87,6 @@ distutils_do_install() {
 	fi
 }
 
-EXPORT_FUNCTIONS do_compile do_install
+EXPORT_FUNCTIONS do_configure do_compile do_install
 
 export LDSHARED="${CCLD} -shared"
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index d01d9d7..1d0c54a 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -12,6 +12,7 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \
 
 distutils3_do_configure() {
 	if [ "${CLEANBROKEN}" != "1" ] ; then
+		NO_FETCH_BUILD=1 \
 		${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS}
 	fi
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.