python3: Update to version 3.4.3

[ipfire-3.x.git] / python3 / python-3.4.3-lib64.patch

diff --git a/python3/python-3.3.0b1-lib64.patch b/python3/python-3.4.3-lib64.patch
similarity index 69%
rename from python3/python-3.3.0b1-lib64.patch
rename to python3/python-3.4.3-lib64.patch
index 5ae03aaec83faf442d1b7e46fa7b8b51c6e0af00..db5fd95ba978303383e67a33e469ed85fe78519e 100644 (file)
--- a/python3/python-3.3.0b1-lib64.patch
+++ b/python3/python-3.4.3-lib64.patch
@@ -1,6 +1,5 @@
-diff -up cpython-59223da36dec/Lib/distutils/command/install.py.lib64 cpython-59223da36dec/Lib/distutils/command/install.py
---- cpython-59223da36dec/Lib/distutils/command/install.py.lib64        2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Lib/distutils/command/install.py      2012-08-07 16:41:00.573477549 -0400
+--- Python-3.4.0b1/Lib/distutils/command/install.py.lib64     2013-11-24 21:36:54.000000000 +0100
++++ Python-3.4.0b1/Lib/distutils/command/install.py     2013-11-27 11:10:43.821150774 +0100
 @@ -45,14 +45,14 @@ else:
  INSTALL_SCHEMES = {
      'unix_prefix': {
@@ -18,10 +17,9 @@ diff -up cpython-59223da36dec/Lib/distutils/command/install.py.lib64 cpython-592
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -up cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64 cpython-59223da36dec/Lib/distutils/sysconfig.py
---- cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64      2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Lib/distutils/sysconfig.py    2012-08-07 16:41:00.573477549 -0400
-@@ -139,8 +139,12 @@ def get_python_lib(plat_specific=0, stan
+--- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64    2013-11-24 21:36:54.000000000 +0100
++++ Python-3.4.0b1/Lib/distutils/sysconfig.py  2013-11-27 11:10:43.821150774 +0100
+@@ -141,8 +141,12 @@
              prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
@@ -35,13 +33,12 @@ diff -up cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64 cpython-59223da36
          if standard_lib:
              return libpython
          else:
-diff -up cpython-59223da36dec/Lib/site.py.lib64 cpython-59223da36dec/Lib/site.py
---- cpython-59223da36dec/Lib/site.py.lib64     2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Lib/site.py   2012-08-07 16:41:00.573477549 -0400
-@@ -303,12 +303,16 @@ def getsitepackages(prefixes=None):
-         if sys.platform in ('os2emx', 'riscos'):
-             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-         elif os.sep == '/':
+--- Python-3.4.0b1/Lib/site.py.lib64   2013-11-24 21:36:54.000000000 +0100
++++ Python-3.4.0b1/Lib/site.py 2013-11-27 11:10:43.822150773 +0100
+@@ -304,12 +304,16 @@
+         seen.add(prefix)
+ 
+         if os.sep == '/':
 +            sitepackages.append(os.path.join(prefix, "lib64",
 +                                        "python" + sys.version[:3],
 +                                        "site-packages"))
@@ -55,10 +52,9 @@ diff -up cpython-59223da36dec/Lib/site.py.lib64 cpython-59223da36dec/Lib/site.py
              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
          if sys.platform == "darwin":
              # for framework builds *only* we add the standard Apple
-diff -up cpython-59223da36dec/Lib/sysconfig.py.lib64 cpython-59223da36dec/Lib/sysconfig.py
---- cpython-59223da36dec/Lib/sysconfig.py.lib64        2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Lib/sysconfig.py      2012-08-07 16:41:00.574477549 -0400
-@@ -21,10 +21,10 @@ __all__ = [
+--- Python-3.4.0b1/Lib/sysconfig.py.lib64      2013-11-24 21:36:54.000000000 +0100
++++ Python-3.4.0b1/Lib/sysconfig.py    2013-11-27 11:10:43.822150773 +0100
+@@ -20,10 +20,10 @@
  
  _INSTALL_SCHEMES = {
      'posix_prefix': {
@@ -72,7 +68,7 @@ diff -up cpython-59223da36dec/Lib/sysconfig.py.lib64 cpython-59223da36dec/Lib/sy
          'include':
              '{installed_base}/include/python{py_version_short}{abiflags}',
          'platinclude':
-@@ -81,10 +81,10 @@ _INSTALL_SCHEMES = {
+@@ -61,10 +61,10 @@
          'data': '{userbase}',
          },
      'posix_user': {
@@ -86,10 +82,9 @@ diff -up cpython-59223da36dec/Lib/sysconfig.py.lib64 cpython-59223da36dec/Lib/sy
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data': '{userbase}',
-diff -up cpython-59223da36dec/Lib/test/test_site.py.lib64 cpython-59223da36dec/Lib/test/test_site.py
---- cpython-59223da36dec/Lib/test/test_site.py.lib64   2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Lib/test/test_site.py 2012-08-07 16:41:00.574477549 -0400
-@@ -239,12 +239,15 @@ class HelperFunctionsTests(unittest.Test
+--- Python-3.4.0b1/Lib/test/test_site.py.lib64 2013-11-24 21:36:55.000000000 +0100
++++ Python-3.4.0b1/Lib/test/test_site.py       2013-11-27 11:10:43.822150773 +0100
+@@ -244,12 +244,15 @@
              self.assertEqual(dirs[2], wanted)
          elif os.sep == '/':
              # OS X non-framwework builds, Linux, FreeBSD, etc
@@ -108,10 +103,9 @@ diff -up cpython-59223da36dec/Lib/test/test_site.py.lib64 cpython-59223da36dec/L
          else:
              # other platforms
              self.assertEqual(len(dirs), 2)
-diff -up cpython-59223da36dec/Makefile.pre.in.lib64 cpython-59223da36dec/Makefile.pre.in
---- cpython-59223da36dec/Makefile.pre.in.lib64 2012-08-07 16:41:00.557477550 -0400
-+++ cpython-59223da36dec/Makefile.pre.in       2012-08-07 16:41:00.575477549 -0400
-@@ -108,7 +108,7 @@ LIBDIR=            @libdir@
+--- Python-3.4.0b1/Makefile.pre.in.lib64       2013-11-27 11:10:43.814150786 +0100
++++ Python-3.4.0b1/Makefile.pre.in     2013-11-27 11:10:43.823150771 +0100
+@@ -115,7 +115,7 @@
  MANDIR=               @mandir@
  INCLUDEDIR=   @includedir@
  CONFINCLUDEDIR=       $(exec_prefix)/include
@@ -120,9 +114,8 @@ diff -up cpython-59223da36dec/Makefile.pre.in.lib64 cpython-59223da36dec/Makefil
  ABIFLAGS=     @ABIFLAGS@
  
  # Detailed destination directories
-diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modules/getpath.c
---- cpython-59223da36dec/Modules/getpath.c.lib64       2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/Modules/getpath.c     2012-08-07 16:41:00.575477549 -0400
+--- Python-3.4.0b1/Modules/getpath.c.lib64     2013-11-24 21:36:56.000000000 +0100
++++ Python-3.4.0b1/Modules/getpath.c   2013-11-27 11:17:33.619449704 +0100
 @@ -122,8 +122,8 @@
  #endif
  
@@ -134,16 +127,16 @@ diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modul
  #endif
  
  #ifndef LANDMARK
-@@ -135,7 +135,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1]
- static wchar_t progpath[MAXPATHLEN+1];
- static wchar_t *module_search_path = NULL;
- static int module_search_path_malloced = 0;
--static wchar_t *lib_python = L"lib/python" VERSION;
-+static wchar_t *lib_python = L"lib64/python" VERSION;
+@@ -498,7 +498,7 @@
+     _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
+     _prefix = _Py_char2wchar(PREFIX, NULL);
+     _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
+-    lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
++    lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
  
- static void
- reduce(wchar_t *dir)
-@@ -677,7 +677,7 @@ calculate_path(void)
+     if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
+         Py_FatalError(
+@@ -687,7 +687,7 @@
      }
      else
          wcsncpy(zip_path, _prefix, MAXPATHLEN);
@@ -152,7 +145,7 @@ diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modul
      bufsz = wcslen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
-@@ -687,7 +687,7 @@ calculate_path(void)
+@@ -699,7 +699,7 @@
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
@@ -161,10 +154,9 @@ diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modul
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -up cpython-59223da36dec/setup.py.lib64 cpython-59223da36dec/setup.py
---- cpython-59223da36dec/setup.py.lib64        2012-08-07 06:10:57.000000000 -0400
-+++ cpython-59223da36dec/setup.py      2012-08-07 16:41:32.153475390 -0400
-@@ -438,7 +438,7 @@ class PyBuildExt(build_ext):
+--- Python-3.4.0b1/setup.py.lib64      2013-11-24 21:36:56.000000000 +0100
++++ Python-3.4.0b1/setup.py    2013-11-27 11:10:43.824150769 +0100
+@@ -441,7 +441,7 @@
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
          if not cross_compiling:
@@ -173,7 +165,7 @@ diff -up cpython-59223da36dec/setup.py.lib64 cpython-59223da36dec/setup.py
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
          # only change this for cross builds for 3.3, issues on Mageia
          if cross_compiling:
-@@ -708,11 +708,11 @@ class PyBuildExt(build_ext):
+@@ -718,11 +718,11 @@
              elif curses_library:
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
@@ -187,7 +179,7 @@ diff -up cpython-59223da36dec/setup.py.lib64 cpython-59223da36dec/setup.py
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -749,8 +749,8 @@ class PyBuildExt(build_ext):
+@@ -759,8 +759,8 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,