Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From f6411021856bafedd784748ec33494151e783b51 Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 14 May 2013 15:00:26 -0700 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 4 | Subject: [PATCH] python3: Add target and native recipes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6 | Upstream-Status: Inappropriate [embedded specific] |
| 7 | |
| 8 | 02/2015 Rebased for Python 3.4.2 |
| 9 | |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 10 | The proper prefix is inside our staging area. |
| 11 | Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> |
| 12 | Signed-off-by: Phil Blundell <philb@gnu.org> |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 15 | --- |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 16 | Lib/distutils/sysconfig.py | 14 +++++++++++--- |
| 17 | 1 file changed, 11 insertions(+), 3 deletions(-) |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 18 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 20 | index 3414a76..361d3a1 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 21 | --- a/Lib/distutils/sysconfig.py |
| 22 | +++ b/Lib/distutils/sysconfig.py |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 23 | @@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 24 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
| 25 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
| 26 | """ |
| 27 | - if prefix is None: |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 28 | + if prefix is None and os.environ.get('STAGING_INCDIR', ""): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 29 | + prefix = os.environ['STAGING_INCDIR'].rstrip('include') |
| 30 | + elif prefix is None: |
| 31 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
| 32 | if os.name == "posix": |
| 33 | if python_build: |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 34 | @@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 35 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
| 36 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
| 37 | """ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 38 | - if prefix is None: |
| 39 | + if os.environ.get('STAGING_LIBDIR', ""): |
| 40 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] |
| 41 | + else: |
| 42 | + lib_basename = "lib" |
| 43 | + if prefix is None and os.environ.get('STAGING_LIBDIR', ""): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 44 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 45 | + elif prefix is None: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 46 | if standard_lib: |
| 47 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 48 | else: |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 49 | @@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 50 | else: |
| 51 | # Pure Python |
| 52 | libdir = "lib" |
| 53 | - libpython = os.path.join(prefix, libdir, |
| 54 | + libpython = os.path.join(prefix, lib_basename, |
| 55 | "python" + get_python_version()) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 56 | if standard_lib: |
| 57 | return libpython |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 58 | -- |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 59 | 2.20.1 |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 60 | |