From b08b570c8624303acbb6bb064a7bda466a679df4 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 20 Dec 2017 14:29:50 -0500 Subject: python-twisted: avoid downloading build dependencies setup.py will attempt to download python-incremental, as it is not present in the sysroot. This is at the least wrong since some random version of python-incremental will be used to build against (akin to host contamination) and at most a build failure (when network access is unavailable). So make python-incrementa-native available and a DEPENDS. Unfortunately python-incremental has a dependency on python-twisted and vice versa. So we need to forcefully break this circular dependency. Fortunately this doesn't affect the build of python-twisted. Unfortunately if anyone else attempts to use python-incremental-native there might be issues should it ever run the code that does the import of twisted. This is not an issue now and a comment has been added to hopefully make this issue known to anyone else coming along at a later time. Signed-off-by: Mark Asselstine Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python-incremental.inc | 6 ++++++ meta-python/recipes-devtools/python/python-twisted.inc | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-incremental.inc b/meta-python/recipes-devtools/python/python-incremental.inc index 3675458688..b63fac9791 100644 --- a/meta-python/recipes-devtools/python/python-incremental.inc +++ b/meta-python/recipes-devtools/python/python-incremental.inc @@ -12,3 +12,9 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-twisted \ ${PYTHON_PN}-click \ " + +# -native is needed to build python[3]-twisted, however, we need to take steps to +# prevent a circular dependency. The build apparently does not use the part of +# python-incremental which uses python-twisted, so this hack is OK. +RDEPENDS_${PYTHON_PN}-incremental-native_remove = "${PYTHON_PN}-twisted-native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc index 0dd584f9fe..6480ad54f9 100644 --- a/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-python/recipes-devtools/python/python-twisted.inc @@ -39,6 +39,10 @@ PACKAGES =+ "\ ${PN}-bin \ " +DEPENDS += " \ + ${PYTHON_PN}-incremental-native \ +" + RDEPENDS_${PN} = "\ ${PN}-bin \ ${PN}-core \ -- cgit 1.2.3-korg