mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
2eab360fb2
(From OE-Core rev: 2f30a782ae5500d9b7dcc37e2cfc43312a470605) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
From b84b849dc72d2523f18fdbbbd28a2cd975596d08 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
|
Date: Wed, 11 May 2022 21:41:14 +0200
|
|
Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the
|
|
prefix to target sysroot
|
|
|
|
This is done by probing STAGING_INCDIR/STAGING_LIBDIRenv vars:
|
|
not the most elegant solution, but distutils/sysconfig has been
|
|
tweaked to do this for many, many year, and so it's easiest
|
|
to replicate here as well, the original is
|
|
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
|
|
|
|
I'm not sure exactly why setuptools now needs a copy, and what
|
|
would happen to this module in light of distutils deprecation.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
setuptools/_distutils/sysconfig.py | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
|
|
index da1eecb..bb02a09 100644
|
|
--- a/setuptools/_distutils/sysconfig.py
|
|
+++ b/setuptools/_distutils/sysconfig.py
|
|
@@ -122,6 +122,8 @@ def get_python_inc(plat_specific=False, prefix=None):
|
|
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
|
|
"""
|
|
default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX
|
|
+ if os.environ.get('STAGING_INCDIR', ""):
|
|
+ default_prefix = os.environ['STAGING_INCDIR'].rstrip('include')
|
|
resolved_prefix = prefix if prefix is not None else default_prefix
|
|
# MinGW imitates posix like layout, but os.name != posix
|
|
os_name = "posix" if is_mingw() else os.name
|
|
@@ -242,7 +244,13 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
|
|
|
|
early_prefix = prefix
|
|
|
|
- if prefix is None:
|
|
+ if os.environ.get('STAGING_LIBDIR', ""):
|
|
+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
|
|
+ else:
|
|
+ lib_basename = "lib"
|
|
+ if prefix is None and os.environ.get('STAGING_LIBDIR', ""):
|
|
+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
|
|
+ elif prefix is None:
|
|
if standard_lib:
|
|
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
|
|
else:
|
|
@@ -257,7 +265,7 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
|
|
# Pure Python
|
|
libdir = "lib"
|
|
implementation = 'pypy' if IS_PYPY else 'python'
|
|
- libpython = os.path.join(prefix, libdir, implementation + get_python_version())
|
|
+ libpython = os.path.join(prefix, lib_basename, implementation + get_python_version())
|
|
return _posix_lib(standard_lib, libpython, early_prefix, prefix)
|
|
elif os.name == "nt":
|
|
if standard_lib:
|