Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 1 | From 6229502e5ae6cbb22240594f002638e9ef78f831 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 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [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 | |
| 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> |
| 15 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | --- |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 17 | Lib/distutils/sysconfig.py | 14 +++++++++++--- |
| 18 | 1 file changed, 11 insertions(+), 3 deletions(-) |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 19 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 21 | index 3dfd0a3..6c6b09a 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | --- a/Lib/distutils/sysconfig.py |
| 23 | +++ b/Lib/distutils/sysconfig.py |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 24 | @@ -97,7 +97,9 @@ def get_python_inc(plat_specific=0, prefix=None): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
| 26 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
| 27 | """ |
| 28 | - if prefix is None: |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 29 | + if prefix is None and os.environ.get('STAGING_INCDIR', ""): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 30 | + prefix = os.environ['STAGING_INCDIR'].rstrip('include') |
| 31 | + elif prefix is None: |
| 32 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
| 33 | if os.name == "posix": |
| 34 | if python_build: |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 35 | @@ -140,7 +142,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] | 36 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
| 37 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
| 38 | """ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 39 | - if prefix is None: |
| 40 | + if os.environ.get('STAGING_LIBDIR', ""): |
| 41 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] |
| 42 | + else: |
| 43 | + lib_basename = "lib" |
| 44 | + if prefix is None and os.environ.get('STAGING_LIBDIR', ""): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 45 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 46 | + elif prefix is None: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 47 | if standard_lib: |
| 48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 49 | else: |
| 50 | @@ -148,7 +156,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 51 | |
| 52 | if os.name == "posix": |
| 53 | libpython = os.path.join(prefix, |
| 54 | - "lib", "python" + get_python_version()) |
| 55 | + lib_basename, "python" + get_python_version()) |
| 56 | if standard_lib: |
| 57 | return libpython |
| 58 | else: |