[oe-commits] [openembedded-core] 17/43: python-setuptools.inc: avoid using += with an over-ride

git at git.openembedded.org git at git.openembedded.org
Tue Jul 17 08:14:13 UTC 2018


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 c6582f50690cabdea10ba6521c80e3c34c85fb80
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Tue Jul 3 17:55:22 2018 -0700

    python-setuptools.inc: avoid using += with an over-ride
    
    An over-ride replaces the original value regardless of whether or
    not it's set up with +=. As replacing the original value seems to be
    the intention here, drop the += to make it more explicit. Also some
    minor recipe formatting tweaks.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/python/python-setuptools.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc
index 25be446..b121b2a 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -2,7 +2,6 @@ SUMMARY = "Download, build, install, upgrade, and uninstall Python packages"
 HOMEPAGE = "https://pypi.python.org/pypi/setuptools"
 SECTION = "devel/python"
 LICENSE = "MIT"
-
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158"
 
 PYPI_PACKAGE_EXT = "zip"
@@ -13,16 +12,12 @@ SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829"
 SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f"
 
 DEPENDS += "${PYTHON_PN}"
-DEPENDS_class-native += "${PYTHON_PN}-native"
-DEPENDS_class-nativesdk += "nativesdk-${PYTHON_PN}"
+DEPENDS_class-native = "${PYTHON_PN}-native"
+DEPENDS_class-nativesdk = "nativesdk-${PYTHON_PN}"
 
 DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR} \
                            --script-dir=${bindir}"
 
-RDEPENDS_${PN}_class-native = "\
-  ${PYTHON_PN}-distutils \
-  ${PYTHON_PN}-compression \
-"
 RDEPENDS_${PN} = "\
   ${PYTHON_PN}-compile \
   ${PYTHON_PN}-compression \
@@ -41,6 +36,11 @@ RDEPENDS_${PN} = "\
   ${PYTHON_PN}-xml \
 "
 
+RDEPENDS_${PN}_class-native = "\
+  ${PYTHON_PN}-compression \
+  ${PYTHON_PN}-distutils \
+"
+
 do_install_prepend() {
     install -d ${D}${PYTHON_SITEPACKAGES_DIR}
 }

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


More information about the Openembedded-commits mailing list