diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-05-30 11:10:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 11:10:23 +0300 |
| commit | b7e689aefdd6f785909349e80e03f4053ac7a458 (patch) | |
| tree | 5e671569874f666728b89e4cd90e526cd74d0404 /lang/python/python3 | |
| parent | 9d65877b5cde2372d325eeb69290d2fee220abc4 (diff) | |
| parent | b8e7a197db135c2b8749ed3c7bf94b3e712e1283 (diff) | |
Merge pull request #9101 from jefferyto/python-setuptools-pip-install
python-setuptools,python-pip: Installation changes
Diffstat (limited to 'lang/python/python3')
| -rw-r--r-- | lang/python/python3/Makefile | 20 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-pip.mk | 12 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-setuptools.mk | 16 |
3 files changed, 26 insertions, 22 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 5b3dcf355..e9468c97f 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -174,21 +174,29 @@ endef ifdef CONFIG_PACKAGE_python3-setuptools define Build/Compile/python3-setuptools - $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ + $(HOST_PYTHON3_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ - --root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ + --root=$(PKG_BUILD_DIR)/install-setuptools \ + --prefix=/usr \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)-py2.py3-none-any.whl - $(call PatchDir,$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages,./patches-setuptools,) + $(call PatchDir,$(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages,./patches-setuptools,) endef endif # CONFIG_PACKAGE_python3-setuptools ifdef CONFIG_PACKAGE_python3-pip define Build/Compile/python3-pip - $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ + $(HOST_PYTHON3_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ - --root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ + --root=$(PKG_BUILD_DIR)/install-pip \ + --prefix=/usr \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-$(PYTHON3_PIP_VERSION)-py2.py3-none-any.whl - $(call PatchDir,$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages,./patches-pip,) + $(call PatchDir,$(PKG_BUILD_DIR)/install-pip/usr/lib/python$(PYTHON3_VERSION)/site-packages,./patches-pip,) endef endif # CONFIG_PACKAGE_python3-pip diff --git a/lang/python/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk index 9f942c660..a27d40a4e 100644 --- a/lang/python/python3/files/python3-package-pip.mk +++ b/lang/python/python3/files/python3-package-pip.mk @@ -17,15 +17,13 @@ endef define Py3Package/python3-pip/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages - $(CP) $(PKG_BUILD_DIR)/install-pip/bin/pip3* $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/install-pip/usr/bin/pip3* $(1)/usr/bin $(CP) \ - $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip \ - $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip-$(PYTHON3_PIP_VERSION).dist-info \ + $(PKG_BUILD_DIR)/install-pip/usr/lib/python$(PYTHON3_VERSION)/site-packages/pip \ + $(PKG_BUILD_DIR)/install-pip/usr/lib/python$(PYTHON3_VERSION)/site-packages/pip-$(PYTHON3_PIP_VERSION).dist-info \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ - for _ in \$(seq 1 10) ; do \ - find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ -exec rm -rf {} \; || continue ; \ - break ; \ - done + find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -path '*/__pycache__/*' -delete + find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -type d -name __pycache__ -delete endef $(eval $(call Py3BasePackage,python3-pip, \ diff --git a/lang/python/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk index ce1fb5c11..b3ccce895 100644 --- a/lang/python/python3/files/python3-package-setuptools.mk +++ b/lang/python/python3/files/python3-package-setuptools.mk @@ -17,18 +17,16 @@ endef define Py3Package/python3-setuptools/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages - $(CP) $(PKG_BUILD_DIR)/install-setuptools/bin/easy_install-* $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/install-setuptools/usr/bin/easy_install-* $(1)/usr/bin $(LN) easy_install-$(PYTHON3_VERSION) $(1)/usr/bin/easy_install-3 $(CP) \ - $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/pkg_resources \ - $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools \ - $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools-$(PYTHON3_SETUPTOOLS_VERSION).dist-info \ - $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \ + $(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages/pkg_resources \ + $(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages/setuptools \ + $(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages/setuptools-$(PYTHON3_SETUPTOOLS_VERSION).dist-info \ + $(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages - for _ in \$(seq 1 10) ; do \ - find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ -exec rm -rf {} \; || continue ; \ - break ; \ - done + find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -path '*/__pycache__/*' -delete + find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -type d -name __pycache__ -delete endef $(eval $(call Py3BasePackage,python3-setuptools, \ |