mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 01:06:37 +01:00
6343a41684
This was held by numpy rejecting setuptools >= 60.x, however it got a workaround in recent point releases and so the upgrade can proceed. Drop 0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch as changed code completely removed upstream. Replicate another distutils/sysconfig.py fix from python recipe via 0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch Add a tomli build dependency to python3-setuptools-scm as new setuptools exposes: | File "/srv/work/alex/poky/build-64-alt/tmp/work/x86_64-linux/python3-setuptools-scm-native/6.4.2-r0/setuptools_scm-6.4.2/src/setuptools_scm/config.py", line 59, in _lazy_tomli_load | from tomli import loads | ModuleNotFoundError: No module named 'tomli' (From OE-Core rev: 0907866325fbfb5774e1a3f0ba0cf110d9b9b663) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
From 41f78746cbe88d263400ee948abef5b3f89cce29 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 | 14 +++++++++++---
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
|
|
index 55a42e1..ead63b9 100644
|
|
--- a/setuptools/_distutils/sysconfig.py
|
|
+++ b/setuptools/_distutils/sysconfig.py
|
|
@@ -102,7 +102,9 @@ def get_python_inc(plat_specific=0, prefix=None):
|
|
If 'prefix' is supplied, use it instead of sys.base_prefix or
|
|
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
|
|
"""
|
|
- if prefix is None:
|
|
+ if prefix is None and os.environ.get('STAGING_INCDIR', ""):
|
|
+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
|
|
+ elif prefix is None:
|
|
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
|
|
if os.name == "posix":
|
|
if IS_PYPY and sys.version_info < (3, 8):
|
|
@@ -167,7 +169,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, 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:
|
|
@@ -182,7 +190,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
|
# Pure Python
|
|
libdir = "lib"
|
|
implementation = 'pypy' if IS_PYPY else 'python'
|
|
- libpython = os.path.join(prefix, libdir,
|
|
+ libpython = os.path.join(prefix, lib_basename,
|
|
implementation + get_python_version())
|
|
return _posix_lib(standard_lib, libpython, early_prefix, prefix)
|
|
elif os.name == "nt":
|