diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-01-18 17:24:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 17:24:26 +0100 |
| commit | 88578e77a00a67efc427087c908f2fc2ed989e86 (patch) | |
| tree | c4f6daf7857ddcefa1a67bc88e034b26c5b73c3c /lang/python/python3/Makefile | |
| parent | de41b63ca45be91273e0ea97213b2a6a29ba2a9a (diff) | |
| parent | 5b2c8bccf3deff782a7a21b98cd96044747f574f (diff) | |
Merge pull request #17624 from jefferyto/python-3.10.2
python3: Update to 3.10.2, refresh patches
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 1d6c021db..50b84b10e 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:=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177 +PKG_HASH:=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> PKG_LICENSE:=PSF-2.0 @@ -206,14 +205,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 @@ -382,8 +373,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) ) |