@@ -1,7 +1,7 @@
-From 22fa800b4cbcfddd57fa262fd7f2aeb06a15a711 Mon Sep 17 00:00:00 2001
+From 23e4f2d9c47de7c4b855e72691217e98c1a504ba Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Mon, 14 Mar 2022 14:39:22 +0000
-Subject: [PATCH 1/2] installer: add --interpreter option
+Subject: [PATCH] installer: add --interpreter option
The currently running Python might not be the right one for the installed
wheels, so add an option to allow the interpreter to be overridden.
@@ -14,8 +14,9 @@ host might not be the right path for the scripts to use on the target.
Upstream-Status: Submitted [https://github.com/pypa/installer/pull/332]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
- src/installer/__main__.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ src/installer/__main__.py | 9 ++++++++-
+ src/installer/scripts.py | 15 +--------------
+ 2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/installer/__main__.py b/src/installer/__main__.py
index b7a7445..25415ea 100644
@@ -67,6 +68,3 @@ index b21a72e..551941f 100644
- # I don't understand a lick what this is trying to do.
- return b"#!/bin/sh\n'''exec' " + quoted + b' "$0" "$@"\n' + b"' '''"
+ return b"#!" + executable_bytes
-2.43.0
-
similarity index 90%
rename from meta/recipes-devtools/python/python3-installer_1.0.1.bb
rename to meta/recipes-devtools/python/python3-installer_1.1.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5038641aec7a77451e31da828ebfae00"
SRC_URI += "file://interpreter.patch"
-SRC_URI[sha256sum] = "052c7fc3721d54c696e2dea019be67539d7b144e924f559f54beb3121831c364"
+SRC_URI[sha256sum] = "5adc0c01ce62d809989e246987cd68944fe5df8af562d0358f65b2ab15cb5de7"
inherit pypi python_flit_core
- Add early return when there are no optimization levels to compile bytecode for - Avoid building a `pathlib.Path` object for each record entry - Declare support for Python 3.15 - Use `os.path.commonpath` instead of `os.path.commonprefix` to address deprecation warnings on Python 3.15 Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../python/python3-installer/interpreter.patch | 12 +++++------- ...installer_1.0.1.bb => python3-installer_1.1.0.bb} | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) rename meta/recipes-devtools/python/{python3-installer_1.0.1.bb => python3-installer_1.1.0.bb} (90%)