summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python-setuptools_36.2.7.bb4
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_36.2.7.bb7
2 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-devtools/python/python-setuptools_36.2.7.bb b/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
index 526474c7ea..0efacc137a 100644
--- a/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
+++ b/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
@@ -5,9 +5,7 @@ PROVIDES = "python-distribute"
5DEPENDS += "python" 5DEPENDS += "python"
6DEPENDS_class-native += "python-native" 6DEPENDS_class-native += "python-native"
7 7
8inherit distutils 8inherit setuptools
9
10DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
11 9
12RDEPENDS_${PN} = "\ 10RDEPENDS_${PN} = "\
13 python-stringold \ 11 python-stringold \
diff --git a/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb b/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
index 63f241809e..a7bca97402 100644
--- a/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
@@ -4,15 +4,10 @@ DEPENDS += "python3"
4DEPENDS_class-native += "python3-native" 4DEPENDS_class-native += "python3-native"
5DEPENDS_class-nativesdk += "nativesdk-python3" 5DEPENDS_class-nativesdk += "nativesdk-python3"
6 6
7inherit distutils3 7inherit setuptools3
8 8
9DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
10
11# The installer puts the wrong path in the setuptools.pth file. Correct it.
12do_install_append() { 9do_install_append() {
13 rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
14 mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install 10 mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
15 echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
16} 11}
17 12
18RDEPENDS_${PN}_class-native = "\ 13RDEPENDS_${PN}_class-native = "\