diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2022-01-17 04:32:03 +0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-01-20 20:48:55 -0800 |
| commit | c7f25b25dffb9f5a912ac70a9f91d09db75bfa83 (patch) | |
| tree | b83b3ec48854a395c302b85cb56a67f479b6f3b5 /lang/python/python3/Makefile | |
| parent | b9bfe1ef1570710c7f852b2734158a1f06b218c8 (diff) | |
python3: Update to 3.9.10, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/python3/Makefile')
| -rw-r--r-- | lang/python/python3/Makefile | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 525658ef0..1f24eb690 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -16,8 +16,7 @@ PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -# FIXME: if updating, get rid of [1] & [2] asap -PKG_HASH:=06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27 +PKG_HASH:=0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> PKG_LICENSE:=Python/2.0 @@ -207,14 +206,6 @@ define Build/Compile/python3-pip --root=$(PKG_BUILD_DIR)/install-pip \ --prefix=/usr \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-$(PYTHON3_PIP_VERSION)-py3-none-any.whl - # FIXME: [1] get rid of this asap; 'patch' doesn't like Windows endings, and this file is full of them... - # I actually tried this in a number of ways and the only way to fix this is to implement - # a poor-man's dos2unix using sed. - # The issue is with the pip package; it seems that it throws in some Windows line-endings - # and 'patch' won't handle them. So, we do a "dos2unix" and then patch. - # We can get rid of this once this is solved upstream and in pip: - # https://github.com/pypa/pep517/pull/130 - sed 's/\r//' -i $(PKG_BUILD_DIR)/install-pip/usr/lib/python$(PYTHON3_VERSION)/site-packages/pip/_vendor/pep517/in_process/__init__.py $(call PatchDir,$(PKG_BUILD_DIR)/install-pip/usr/lib/python$(PYTHON3_VERSION)/site-packages,./patches-pip,) endef else @@ -373,8 +364,6 @@ define Host/Install touch $(HOST_PYTHON3_PKG_DIR)/.setuptools_installed_$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE) ) $(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.pip_installed_$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE)),, - # FIXME: [2] get rid of this asap; same as [1] - sed 's/\r//' -i $(HOST_PYTHON3_PKG_DIR)/pip/_vendor/pep517/in_process/__init__.py $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-pip,) touch $(HOST_PYTHON3_PKG_DIR)/.pip_installed_$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE) ) |