Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [embedded specific] |
| 2 | |
| 3 | # The proper prefix is inside our staging area. |
| 4 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> |
| 5 | # Signed-off-by: Phil Blundell <philb@gnu.org> |
| 6 | |
| 7 | --- Python-2.6.6/Lib/distutils/sysconfig.py.orig 2012-01-03 14:02:03.027005296 +0000 |
| 8 | +++ Python-2.6.6/Lib/distutils/sysconfig.py 2012-01-03 14:02:31.517601081 +0000 |
| 9 | @@ -19,8 +19,8 @@ |
| 10 | from distutils.errors import DistutilsPlatformError |
| 11 | |
| 12 | # These are needed in a couple of spots, so just compute them once. |
| 13 | -PREFIX = os.path.normpath(sys.prefix) |
| 14 | -EXEC_PREFIX = os.path.normpath(sys.exec_prefix) |
| 15 | +PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) |
| 16 | +EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) |
| 17 | |
| 18 | # Path to the base directory of the project. On Windows the binary may |
| 19 | # live in project/PCBuild9. If we're dealing with an x64 Windows build, |
| 20 | @@ -70,7 +70,7 @@ |
| 21 | sys.exec_prefix -- i.e., ignore 'plat_specific'. |
| 22 | """ |
| 23 | if prefix is None: |
| 24 | - prefix = plat_specific and EXEC_PREFIX or PREFIX |
| 25 | + prefix = os.environ['STAGING_INCDIR'].rstrip('include') |
| 26 | |
| 27 | if os.name == "posix": |
| 28 | if python_build: |
| 29 | @@ -115,12 +115,16 @@ |
| 30 | If 'prefix' is supplied, use it instead of sys.prefix or |
| 31 | sys.exec_prefix -- i.e., ignore 'plat_specific'. |
| 32 | """ |
| 33 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] |
| 34 | if prefix is None: |
| 35 | - prefix = plat_specific and EXEC_PREFIX or PREFIX |
| 36 | + if plat_specific: |
| 37 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) |
| 38 | + else: |
| 39 | + prefix = PREFIX |
| 40 | |
| 41 | if os.name == "posix": |
| 42 | libpython = os.path.join(prefix, |
| 43 | - "lib", "python" + get_python_version()) |
| 44 | + lib_basename, "python" + get_python_version()) |
| 45 | if standard_lib: |
| 46 | return libpython |
| 47 | else: |
| 48 | @@ -216,7 +220,7 @@ |
| 49 | else: |
| 50 | # The name of the config.h file changed in 2.2 |
| 51 | config_h = 'pyconfig.h' |
| 52 | - return os.path.join(inc_dir, config_h) |
| 53 | + return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) |
| 54 | |
| 55 | |
| 56 | def get_makefile_filename(): |
| 57 | @@ -225,7 +229,7 @@ |
| 58 | return os.path.join(os.path.dirname(os.path.realpath(sys.executable)), |
| 59 | "Makefile") |
| 60 | lib_dir = get_python_lib(plat_specific=1, standard_lib=1) |
| 61 | - return os.path.join(lib_dir, "config", "Makefile") |
| 62 | + return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) |
| 63 | |
| 64 | |
| 65 | def parse_config_h(fp, g=None): |