diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-07-26 22:50:21 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | ce31c498f8fd6332ba81fb60c6406ea1cd7bc4d6 (patch) | |
tree | 8d7e40c1db26eb73053a2b771cf79fbe3439d013 /meta | |
parent | c40f535fbf173c5da2a9b3eeb73efc7385a9eeab (diff) | |
download | poky-ce31c498f8fd6332ba81fb60c6406ea1cd7bc4d6.tar.gz |
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]
(From OE-Core rev: 9d556092fcc6f04c487afd126d52935bac133165)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/distutils.bbclass | 9 | ||||
-rw-r--r-- | meta/classes/distutils3.bbclass | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 3cf1d6b786..e7d48ab907 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass | |||
@@ -9,6 +9,13 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ | |||
9 | --install-lib=${PYTHON_SITEPACKAGES_DIR} \ | 9 | --install-lib=${PYTHON_SITEPACKAGES_DIR} \ |
10 | --install-data=${datadir}" | 10 | --install-data=${datadir}" |
11 | 11 | ||
12 | distutils_do_configure() { | ||
13 | if [ "${CLEANBROKEN}" != "1" ] ; then | ||
14 | NO_FETCH_BUILD=1 \ | ||
15 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS} | ||
16 | fi | ||
17 | } | ||
18 | |||
12 | distutils_do_compile() { | 19 | distutils_do_compile() { |
13 | NO_FETCH_BUILD=1 \ | 20 | NO_FETCH_BUILD=1 \ |
14 | STAGING_INCDIR=${STAGING_INCDIR} \ | 21 | STAGING_INCDIR=${STAGING_INCDIR} \ |
@@ -80,6 +87,6 @@ distutils_do_install() { | |||
80 | fi | 87 | fi |
81 | } | 88 | } |
82 | 89 | ||
83 | EXPORT_FUNCTIONS do_compile do_install | 90 | EXPORT_FUNCTIONS do_configure do_compile do_install |
84 | 91 | ||
85 | export LDSHARED="${CCLD} -shared" | 92 | export LDSHARED="${CCLD} -shared" |
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index d01d9d78d5..1d0c54a513 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass | |||
@@ -12,6 +12,7 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ | |||
12 | 12 | ||
13 | distutils3_do_configure() { | 13 | distutils3_do_configure() { |
14 | if [ "${CLEANBROKEN}" != "1" ] ; then | 14 | if [ "${CLEANBROKEN}" != "1" ] ; then |
15 | NO_FETCH_BUILD=1 \ | ||
15 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS} | 16 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS} |
16 | fi | 17 | fi |
17 | } | 18 | } |