| From 7c560d917ee0e536c76fac275d1cb0b6136269ab Mon Sep 17 00:00:00 2001 |
| From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| Date: Wed, 23 Dec 2015 11:32:23 +0100 |
| Subject: [PATCH] distutils/sysconfig: use sysconfigdata |
| |
| In order to make the use of sysconfig cross-compilation compatible, |
| use _sysconfigdata. |
| |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| --- |
| Lib/distutils/sysconfig.py | 37 ++++--------------------------------- |
| 1 file changed, 4 insertions(+), 33 deletions(-) |
| |
| diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
| index 573724d..721edec 100644 |
| --- a/Lib/distutils/sysconfig.py |
| +++ b/Lib/distutils/sysconfig.py |
| @@ -414,40 +414,11 @@ def expand_makefile_vars(s, vars): |
| _config_vars = None |
| |
| def _init_posix(): |
| - """Initialize the module as appropriate for POSIX systems.""" |
| - g = {} |
| - # load the installed Makefile: |
| - try: |
| - filename = get_makefile_filename() |
| - parse_makefile(filename, g) |
| - except OSError as msg: |
| - my_msg = "invalid Python installation: unable to open %s" % filename |
| - if hasattr(msg, "strerror"): |
| - my_msg = my_msg + " (%s)" % msg.strerror |
| - |
| - raise DistutilsPlatformError(my_msg) |
| - |
| - # load the installed pyconfig.h: |
| - try: |
| - filename = get_config_h_filename() |
| - with open(filename) as file: |
| - parse_config_h(file, g) |
| - except OSError as msg: |
| - my_msg = "invalid Python installation: unable to open %s" % filename |
| - if hasattr(msg, "strerror"): |
| - my_msg = my_msg + " (%s)" % msg.strerror |
| - |
| - raise DistutilsPlatformError(my_msg) |
| - |
| - # On AIX, there are wrong paths to the linker scripts in the Makefile |
| - # -- these paths are relative to the Python source, but when installed |
| - # the scripts are in another directory. |
| - if python_build: |
| - g['LDSHARED'] = g['BLDSHARED'] |
| - |
| + # _sysconfigdata is generated at build time, see the sysconfig module |
| + from _sysconfigdata import build_time_vars |
| global _config_vars |
| - _config_vars = g |
| - |
| + _config_vars = {} |
| + _config_vars.update(build_time_vars) |
| |
| def _init_nt(): |
| """Initialize the module as appropriate for NT""" |
| -- |
| 2.6.4 |
| |