python-setuptools: fix path creation in setup scripts
This was fixed a few versions back. But then python-setuptools changed. The problem is that python scripts installed via setuptools & pip would have `#!/build_dir_path/staging_dir/target-x86_64_musl-1.1.15/host/bin/python` as the path in the script, rather than the path on the target (`/usr/bin/python`). This fixes that. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
parent
13a03cf798
commit
df840c1e9f
1 changed files with 8 additions and 8 deletions
|
@ -1,13 +1,13 @@
|
||||||
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
|
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
|
||||||
index df1655b..24c34e5 100755
|
index e8b90c7..8598c44 100755
|
||||||
--- a/setuptools/command/easy_install.py
|
--- a/setuptools/command/easy_install.py
|
||||||
+++ b/setuptools/command/easy_install.py
|
+++ b/setuptools/command/easy_install.py
|
||||||
@@ -1885,7 +1885,7 @@ class CommandSpec(list):
|
@@ -1946,6 +1946,8 @@ class CommandSpec(list):
|
||||||
|
Construct a CommandSpec from a parameter to build_scripts, which may
|
||||||
|
be None.
|
||||||
|
"""
|
||||||
|
+ if os.environ.get('__PYVENV_LAUNCHER__'):
|
||||||
|
+ return cls.from_environment()
|
||||||
|
if isinstance(param, cls):
|
||||||
return param
|
return param
|
||||||
if isinstance(param, list):
|
if isinstance(param, list):
|
||||||
return cls(param)
|
|
||||||
- if param is None:
|
|
||||||
+ if param is None or os.environ.get('__PYVENV_LAUNCHER__'):
|
|
||||||
return cls.from_environment()
|
|
||||||
# otherwise, assume it's a string.
|
|
||||||
return cls.from_string(param)
|
|
||||||
|
|
Loading…
Reference in a new issue