* Add extract.post patch to set a static version in pyproject.toml * python3-zipp is now a build requirement instead of just runtime
Signed-off-by: Lars Pedersen <[email protected]> --- rules/python3-importlib-metadata.in | 3 ++- rules/python3-importlib-metadata.make | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rules/python3-importlib-metadata.in b/rules/python3-importlib-metadata.in index 602e396b3..897970da8 100644 --- a/rules/python3-importlib-metadata.in +++ b/rules/python3-importlib-metadata.in @@ -2,9 +2,10 @@ config PYTHON3_IMPORTLIB_METADATA tristate + select HOST_PYTHON3_PYBUILD select HOST_PYTHON3_SETUPTOOLS_SCM select PYTHON3 - select PYTHON3_ZIPP if RUNTIME + select PYTHON3_ZIPP prompt "importlib-metadata" help A library to access the metadata for a Python package. diff --git a/rules/python3-importlib-metadata.make b/rules/python3-importlib-metadata.make index 1426b5035..e9cbe43bf 100644 --- a/rules/python3-importlib-metadata.make +++ b/rules/python3-importlib-metadata.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_IMPORTLIB_METADATA) += python3-importlib-metadata # # Paths and names # -PYTHON3_IMPORTLIB_METADATA_VERSION := 1.7.0 -PYTHON3_IMPORTLIB_METADATA_MD5 := 4505ea85600cca1e693a4f8f5dd27ba8 +PYTHON3_IMPORTLIB_METADATA_VERSION := 8.4.0 +PYTHON3_IMPORTLIB_METADATA_MD5 := a21dfeb76ac09ec82011bedf45e203b5 PYTHON3_IMPORTLIB_METADATA := importlib_metadata-$(PYTHON3_IMPORTLIB_METADATA_VERSION) PYTHON3_IMPORTLIB_METADATA_SUFFIX := tar.gz PYTHON3_IMPORTLIB_METADATA_URL := $(call ptx/mirror-pypi, importlib_metadata, $(PYTHON3_IMPORTLIB_METADATA).$(PYTHON3_IMPORTLIB_METADATA_SUFFIX)) @@ -23,7 +23,7 @@ PYTHON3_IMPORTLIB_METADATA_SOURCE := $(SRCDIR)/$(PYTHON3_IMPORTLIB_METADATA).$(P PYTHON3_IMPORTLIB_METADATA_DIR := $(BUILDDIR)/$(PYTHON3_IMPORTLIB_METADATA) PYTHON3_IMPORTLIB_METADATA_LICENSE := Apache-2.0 PYTHON3_IMPORTLIB_METADATA_LICENSE_FILES := \ - file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e + file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 # ---------------------------------------------------------------------------- # Prepare @@ -31,6 +31,13 @@ PYTHON3_IMPORTLIB_METADATA_LICENSE_FILES := \ PYTHON3_IMPORTLIB_METADATA_CONF_TOOL := python3 +$(STATEDIR)/python3-importlib-metadata.extract.post: + @$(call targetinfo) + @$(call world/patchin/post, PYTHON3_IMPORTLIB_METADATA) + @sed -i 's/^dynamic =.*/version = "$(PYTHON3_IMPORTLIB_METADATA_VERSION)"/g' $(PYTHON3_IMPORTLIB_METADATA_DIR)/pyproject.toml + @$(call touch) + + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -- 2.46.1
