1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
|
From: Stefano Rivera <stefano@rivera.za.net>
Date: Sat, 10 Aug 2024 17:54:30 +0900
Subject: gh-81742 Omit platform from _sysconfigdata filename for multiarch
The multiarch triple encodes the platform name, so there is no need to
have both in the _sysconfigdata filename.
Debian has been carrying a (dumber) variant of this patch for a while.
Fixes: #81742
Origin: Debian cpython packaging
Forwarded: https://github.com/python/cpython/pull/122879
Bug-Upstream: https://github.com/python/cpython/issues/81742
---
lib-python/3/sysconfig.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib-python/3/sysconfig.py b/lib-python/3/sysconfig.py
index 173c7a4..b5341b8 100644
--- a/lib-python/3/sysconfig.py
+++ b/lib-python/3/sysconfig.py
@@ -499,9 +499,10 @@ def get_makefile_filename():
def _get_sysconfigdata_name():
multiarch = getattr(sys.implementation, '_multiarch', '')
+ platform = multiarch or sys.platform
return os.environ.get(
'_PYTHON_SYSCONFIGDATA_NAME',
- f'_sysconfigdata_{sys.abiflags}_{sys.platform}_{multiarch}',
+ f'_sysconfigdata_{sys.abiflags}_{platform}',
)
|