Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame^] | 1 | From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 31 Jan 2019 16:46:30 +0100 |
| 4 | Subject: [PATCH] distutils/sysconfig: append |
| 5 | STAGING_LIBDIR/python-sysconfigdata to sys.path |
| 6 | |
| 7 | So that target configuration can be used when running native python |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe-core specific] |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | |
| 12 | --- |
| 13 | Lib/distutils/sysconfig.py | 2 ++ |
| 14 | Lib/sysconfig.py | 2 ++ |
| 15 | 2 files changed, 4 insertions(+) |
| 16 | |
| 17 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame^] | 18 | index 0a034ee..3dfd0a3 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | --- a/Lib/distutils/sysconfig.py |
| 20 | +++ b/Lib/distutils/sysconfig.py |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame^] | 21 | @@ -439,6 +439,8 @@ def _init_posix(): |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | platform=sys.platform, |
| 23 | multiarch=getattr(sys.implementation, '_multiarch', ''), |
| 24 | )) |
| 25 | + if 'STAGING_LIBDIR' in os.environ: |
| 26 | + sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata') |
| 27 | _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) |
| 28 | build_time_vars = _temp.build_time_vars |
| 29 | global _config_vars |
| 30 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame^] | 31 | index 87fa5e6..756a41c 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 32 | --- a/Lib/sysconfig.py |
| 33 | +++ b/Lib/sysconfig.py |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame^] | 34 | @@ -419,6 +419,8 @@ def _init_posix(vars): |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | """Initialize the module as appropriate for POSIX systems.""" |
| 36 | # _sysconfigdata is generated at build time, see _generate_posix_vars() |
| 37 | name = _get_sysconfigdata_name() |
| 38 | + if 'STAGING_LIBDIR' in os.environ: |
| 39 | + sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata') |
| 40 | _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) |
| 41 | build_time_vars = _temp.build_time_vars |
| 42 | vars.update(build_time_vars) |