diff options
Diffstat (limited to 'lang/python/python3')
| -rw-r--r-- | lang/python/python3/Makefile | 11 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-pkg-resources.mk | 30 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-setuptools.mk | 3 |
3 files changed, 41 insertions, 3 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 7199d6369..f8142ff1c 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PKG_NAME:=python3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -41,6 +41,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_python3-pkg-resources \ CONFIG_PACKAGE_python3-setuptools CONFIG_PACKAGE_python3-pip \ CONFIG_PYTHON3_BLUETOOTH_SUPPORT @@ -172,6 +173,14 @@ define Build/Prepare endef ifdef CONFIG_PACKAGE_python3-setuptools +PYTHON3_SETUPTOOLS_BUILD:=1 +endif + +ifdef CONFIG_PACKAGE_python3-pkg-resources +PYTHON3_SETUPTOOLS_BUILD:=1 +endif + +ifeq ($(PYTHON3_SETUPTOOLS_BUILD),1) define Build/Compile/python3-setuptools $(HOST_PYTHON3_PIP) \ --disable-pip-version-check \ diff --git a/lang/python/python3/files/python3-package-pkg-resources.mk b/lang/python/python3/files/python3-package-pkg-resources.mk new file mode 100644 index 000000000..592fe2c8c --- /dev/null +++ b/lang/python/python3/files/python3-package-pkg-resources.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 2019 Alexandru Ardelean <ardeleanalex@gmail.com> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Package/python3-pkg-resources +$(call Package/python3/Default) + TITLE:=Python $(PYTHON3_VERSION) pkg_resources module (part of setuptools) + VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE) + LICENSE:=MIT + LICENSE_FILES:=LICENSE +# CPE_ID:=cpe:/a:python:setuptools # not currently handled this way by uscan + DEPENDS:=+python3 +endef + +define Py3Package/python3-pkg-resources/install + $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages + $(CP) \ + $(PKG_BUILD_DIR)/install-setuptools/usr/lib/python$(PYTHON3_VERSION)/site-packages/pkg_resources \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages + 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-pkg-resources, \ + , \ + DO_NOT_ADD_TO_PACKAGE_DEPENDS \ +)) diff --git a/lang/python/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk index b3ccce895..64a86b81d 100644 --- a/lang/python/python3/files/python3-package-setuptools.mk +++ b/lang/python/python3/files/python3-package-setuptools.mk @@ -12,7 +12,7 @@ $(call Package/python3/Default) LICENSE:=MIT LICENSE_FILES:=LICENSE # CPE_ID:=cpe:/a:python:setuptools # not currently handled this way by uscan - DEPENDS:=+python3 + DEPENDS:=+python3 +python3-pkg-resources endef define Py3Package/python3-setuptools/install @@ -20,7 +20,6 @@ define Py3Package/python3-setuptools/install $(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/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 \ |