diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-07-03 17:55:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:18:42 +0100 |
commit | 30ea610d0405e687877e946faa71e20d19baa57e (patch) | |
tree | 42e463fa9335a254a1c39b92efc0495523e39e43 /meta | |
parent | 8df7480d1ce52010f2c91782ceacb25a61e80c2f (diff) | |
download | poky-30ea610d0405e687877e946faa71e20d19baa57e.tar.gz |
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.
(From OE-Core rev: bda531e65bb6cc9f654c333e2f71283eccd17f27)
Signed-off-by: Andre McCurdy <armccurdy@gmail.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/recipes-devtools/python/python-setuptools.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 25be446cb3..b121b2ab3c 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" | |||
2 | HOMEPAGE = "https://pypi.python.org/pypi/setuptools" | 2 | HOMEPAGE = "https://pypi.python.org/pypi/setuptools" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" |
7 | 6 | ||
8 | PYPI_PACKAGE_EXT = "zip" | 7 | PYPI_PACKAGE_EXT = "zip" |
@@ -13,16 +12,12 @@ SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829" | |||
13 | SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" | 12 | SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" |
14 | 13 | ||
15 | DEPENDS += "${PYTHON_PN}" | 14 | DEPENDS += "${PYTHON_PN}" |
16 | DEPENDS_class-native += "${PYTHON_PN}-native" | 15 | DEPENDS_class-native = "${PYTHON_PN}-native" |
17 | DEPENDS_class-nativesdk += "nativesdk-${PYTHON_PN}" | 16 | DEPENDS_class-nativesdk = "nativesdk-${PYTHON_PN}" |
18 | 17 | ||
19 | DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR} \ | 18 | DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR} \ |
20 | --script-dir=${bindir}" | 19 | --script-dir=${bindir}" |
21 | 20 | ||
22 | RDEPENDS_${PN}_class-native = "\ | ||
23 | ${PYTHON_PN}-distutils \ | ||
24 | ${PYTHON_PN}-compression \ | ||
25 | " | ||
26 | RDEPENDS_${PN} = "\ | 21 | RDEPENDS_${PN} = "\ |
27 | ${PYTHON_PN}-compile \ | 22 | ${PYTHON_PN}-compile \ |
28 | ${PYTHON_PN}-compression \ | 23 | ${PYTHON_PN}-compression \ |
@@ -41,6 +36,11 @@ RDEPENDS_${PN} = "\ | |||
41 | ${PYTHON_PN}-xml \ | 36 | ${PYTHON_PN}-xml \ |
42 | " | 37 | " |
43 | 38 | ||
39 | RDEPENDS_${PN}_class-native = "\ | ||
40 | ${PYTHON_PN}-compression \ | ||
41 | ${PYTHON_PN}-distutils \ | ||
42 | " | ||
43 | |||
44 | do_install_prepend() { | 44 | do_install_prepend() { |
45 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 45 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
46 | } | 46 | } |