summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-12-28 08:37:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-28 23:59:56 +0000
commitbbb4d6550097f0feaccee3817d54f23e75b9a5f7 (patch)
tree6c65618f2b430232204f807f331cfffa098c8c9e /meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
parentdb604a273d3907313ae8814a57d1da6b1547c708 (diff)
downloadpoky-bbb4d6550097f0feaccee3817d54f23e75b9a5f7.tar.gz
Revert "python3-native: further tweak to sysconfig.py to find python includes correctly"
Unfortunately, sysconfig is used by: - setuptools to find out where to install new headers - autoconf-archive to find where Python.h is In the first case we want the target location, in the second case we want the sysroot location. The second case is not yet used in the wild (as projects such as gpgpme are using outdated distutils-based m4 macros), but it will become a problem once python 3.12 is out, and said projects are forced to migrate to sysconfig. Let's deal with it then in a more careful manner, and hopefully convince upstream that there is a general problem too. (From OE-Core rev: 499b152bf63749be18fc252978a6cc632254b325) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch')
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index cb79d9c671..dc06baf504 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -1,23 +1,24 @@
1From a73020a9c388b4882c384087882a77ab2c7b3729 Mon Sep 17 00:00:00 2001 1From a73020a9c388b4882c384087882a77ab2c7b3729 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 10 Sep 2021 12:28:31 +0200 3Date: Fri, 10 Sep 2021 12:28:31 +0200
4Subject: [PATCH] Lib/sysconfig.py: use values from build configuration file 4Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
5 file
5 6
6This allows correctly substituting them for target builds using 7This allows correctly substituting them for target installs using
7native python. 8native python.
8 9
9Upstream-Status: Inappropriate [oe-core cross builds] 10Upstream-Status: Inappropriate [oe-core cross builds]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11 12
12--- 13---
13 Lib/sysconfig.py | 7 +++++++ 14 Lib/sysconfig.py | 5 +++++
14 1 file changed, 7 insertions(+) 15 1 file changed, 5 insertions(+)
15 16
16diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py 17diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
17index 93c6f73..a87870f 100644 18index 93c6f73..ff399e2 100644
18--- a/Lib/sysconfig.py 19--- a/Lib/sysconfig.py
19+++ b/Lib/sysconfig.py 20+++ b/Lib/sysconfig.py
20@@ -668,6 +668,13 @@ def get_config_vars(*args): 21@@ -668,6 +668,11 @@ def get_config_vars(*args):
21 _CONFIG_VARS['VPATH'] = sys._vpath 22 _CONFIG_VARS['VPATH'] = sys._vpath
22 if os.name == 'posix': 23 if os.name == 'posix':
23 _init_posix(_CONFIG_VARS) 24 _init_posix(_CONFIG_VARS)
@@ -26,8 +27,6 @@ index 93c6f73..a87870f 100644
26+ _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] 27+ _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix']
27+ _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] 28+ _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix']
28+ _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] 29+ _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR']
29+ _INSTALL_SCHEMES['posix_prefix']['include'] = _CONFIG_VARS['INCLUDEPY']
30+ _INSTALL_SCHEMES['posix_prefix']['platinclude'] = _CONFIG_VARS['INCLUDEPY']
31 if _HAS_USER_BASE: 30 if _HAS_USER_BASE:
32 # Setting 'userbase' is done below the call to the 31 # Setting 'userbase' is done below the call to the
33 # init function to enable using 'get_config_var' in 32 # init function to enable using 'get_config_var' in