From: doko@ubuntu.com <doko@ubuntu.com>
Date: Sat, 4 Jun 2016 23:17:57 +0000 (+0200)
Subject: - Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
X-Git-Tag: v3.6.0a2~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=409482251b06fe75c4ee56e85ffbb4b23d934159;p=thirdparty%2FPython%2Fcpython.git

- Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
---

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index d203f8e42b20..f205dcadebd4 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -415,38 +415,11 @@ _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():
diff --git a/Misc/NEWS b/Misc/NEWS
index 2cef4570eace..9a02894676d0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
+
 - Issue #19611: :mod:`inspect` now reports the implicit ``.0`` parameters
   generated by the compiler for comprehension and generator expression scopes
   as if they were positional-only parameters called ``implicit0``.