5c63280caf
In preparation for the bump to Python 3.5.0, let's switch all the patches to the Git format. This way, a Git repository of the Python source code can be used to manage those patches, which makes it easier to bump to newer Python versions. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
From bdb9cccdc2993e43af1e57ad3b8b0055bab64ba0 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 a1452fe..1df20ad 100644
|
|
--- a/Lib/distutils/sysconfig.py
|
|
+++ b/Lib/distutils/sysconfig.py
|
|
@@ -423,40 +423,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
|
|
|