mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-22 10:32:10 +00:00
python3: bump to 3.4.2
This commit bumps python3 to Python 3.4.2. Two patches had to be changed slightly to fix some minor conflicts. PYTHON3_LIBTOOL_PATH = NO was added to prevent Buildroot from trying to patch a version of libtool for which we don't have matching patches, which isn't a problem since we're anyway not using the part of the Python sources that uses libtool (it's the built-in copy of libffi, and we use the external libffi). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
@@ -2,10 +2,11 @@ Index: b/Lib/distutils/sysconfig.py
|
||||
===================================================================
|
||||
--- a/Lib/distutils/sysconfig.py
|
||||
+++ b/Lib/distutils/sysconfig.py
|
||||
@@ -430,49 +430,11 @@
|
||||
@@ -423,40 +423,11 @@
|
||||
_config_vars = None
|
||||
|
||||
def _init_posix():
|
||||
"""Initialize the module as appropriate for POSIX systems."""
|
||||
- """Initialize the module as appropriate for POSIX systems."""
|
||||
- g = {}
|
||||
- # load the installed Makefile:
|
||||
- try:
|
||||
@@ -36,23 +37,13 @@ Index: b/Lib/distutils/sysconfig.py
|
||||
- if python_build:
|
||||
- g['LDSHARED'] = g['BLDSHARED']
|
||||
-
|
||||
- elif get_python_version() < '2.1':
|
||||
- # The following two branches are for 1.5.2 compatibility.
|
||||
- if sys.platform == 'aix4': # what about AIX 3.x ?
|
||||
- # Linker script is in the config directory, not in Modules as the
|
||||
- # Makefile says.
|
||||
- python_lib = get_python_lib(standard_lib=1)
|
||||
- ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
|
||||
- python_exp = os.path.join(python_lib, 'config', 'python.exp')
|
||||
-
|
||||
- g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
|
||||
-
|
||||
+ # _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"""
|
||||
|
||||
Reference in New Issue
Block a user