carlwgeorge / rpms / python34

Forked from rpms/python34 6 years ago
Clone
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Lib/distutils/command/install.py.lib64     2013-11-24 21:36:54.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Lib/distutils/command/install.py     2013-11-27 11:10:43.821150774 +0100
Matej Stuchlik 2c1c983
@@ -45,14 +45,14 @@ else:
Matej Stuchlik 2c1c983
 INSTALL_SCHEMES = {
Matej Stuchlik 2c1c983
     'unix_prefix': {
Matej Stuchlik 2c1c983
         'purelib': '$base/lib/python$py_version_short/site-packages',
Matej Stuchlik 2c1c983
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
Matej Stuchlik 2c1c983
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
Matej Stuchlik 2c1c983
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
Matej Stuchlik 2c1c983
         'scripts': '$base/bin',
Matej Stuchlik 2c1c983
         'data'   : '$base',
Matej Stuchlik 2c1c983
         },
Matej Stuchlik 2c1c983
     'unix_home': {
Matej Stuchlik 2c1c983
         'purelib': '$base/lib/python',
Matej Stuchlik 2c1c983
-        'platlib': '$base/lib/python',
Matej Stuchlik 2c1c983
+        'platlib': '$base/lib64/python',
Matej Stuchlik 2c1c983
         'headers': '$base/include/python/$dist_name',
Matej Stuchlik 2c1c983
         'scripts': '$base/bin',
Matej Stuchlik 2c1c983
         'data'   : '$base',
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64	2013-11-24 21:36:54.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Lib/distutils/sysconfig.py	2013-11-27 11:10:43.821150774 +0100
Matej Stuchlik 2c1c983
@@ -141,8 +141,12 @@
Matej Stuchlik 2c1c983
             prefix = plat_specific and EXEC_PREFIX or PREFIX
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
     if os.name == "posix":
Matej Stuchlik 2c1c983
+        if plat_specific or standard_lib:
Matej Stuchlik 2c1c983
+            lib = "lib64"
Matej Stuchlik 2c1c983
+        else:
Matej Stuchlik 2c1c983
+            lib = "lib"
Matej Stuchlik 2c1c983
         libpython = os.path.join(prefix,
Matej Stuchlik 2c1c983
-                                 "lib", "python" + get_python_version())
Matej Stuchlik 2c1c983
+                                 lib, "python" + get_python_version())
Matej Stuchlik 2c1c983
         if standard_lib:
Matej Stuchlik 2c1c983
             return libpython
Matej Stuchlik 2c1c983
         else:
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Lib/site.py.lib64	2013-11-24 21:36:54.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Lib/site.py	2013-11-27 11:10:43.822150773 +0100
Matej Stuchlik 2c1c983
@@ -304,12 +304,16 @@
Matej Stuchlik 2c1c983
         seen.add(prefix)
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
         if os.sep == '/':
Matej Stuchlik 2c1c983
+            sitepackages.append(os.path.join(prefix, "lib64",
Matej Stuchlik 2c1c983
+                                        "python" + sys.version[:3],
Matej Stuchlik 2c1c983
+                                        "site-packages"))
Matej Stuchlik 2c1c983
             sitepackages.append(os.path.join(prefix, "lib",
Matej Stuchlik 2c1c983
                                         "python" + sys.version[:3],
Matej Stuchlik 2c1c983
                                         "site-packages"))
Matej Stuchlik 2c1c983
             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
Matej Stuchlik 2c1c983
         else:
Matej Stuchlik 2c1c983
             sitepackages.append(prefix)
Matej Stuchlik 2c1c983
+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
Matej Stuchlik 2c1c983
             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
Matej Stuchlik 2c1c983
         if sys.platform == "darwin":
Matej Stuchlik 2c1c983
             # for framework builds *only* we add the standard Apple
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Lib/sysconfig.py.lib64	2013-11-24 21:36:54.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Lib/sysconfig.py	2013-11-27 11:10:43.822150773 +0100
Matej Stuchlik 2c1c983
@@ -20,10 +20,10 @@
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 _INSTALL_SCHEMES = {
Matej Stuchlik 2c1c983
     'posix_prefix': {
Matej Stuchlik 2c1c983
-        'stdlib': '{installed_base}/lib/python{py_version_short}',
Matej Stuchlik 2c1c983
-        'platstdlib': '{platbase}/lib/python{py_version_short}',
Matej Stuchlik 2c1c983
+        'stdlib': '{installed_base}/lib64/python{py_version_short}',
Matej Stuchlik 2c1c983
+        'platstdlib': '{platbase}/lib64/python{py_version_short}',
Matej Stuchlik 2c1c983
         'purelib': '{base}/lib/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
+        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
         'include':
Matej Stuchlik 2c1c983
             '{installed_base}/include/python{py_version_short}{abiflags}',
Matej Stuchlik 2c1c983
         'platinclude':
Matej Stuchlik 2c1c983
@@ -61,10 +61,10 @@
Matej Stuchlik 2c1c983
         'data': '{userbase}',
Matej Stuchlik 2c1c983
         },
Matej Stuchlik 2c1c983
     'posix_user': {
Matej Stuchlik 2c1c983
-        'stdlib': '{userbase}/lib/python{py_version_short}',
Matej Stuchlik 2c1c983
-        'platstdlib': '{userbase}/lib/python{py_version_short}',
Matej Stuchlik 2c1c983
+        'stdlib': '{userbase}/lib64/python{py_version_short}',
Matej Stuchlik 2c1c983
+        'platstdlib': '{userbase}/lib64/python{py_version_short}',
Matej Stuchlik 2c1c983
         'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
-        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
+        'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
Matej Stuchlik 2c1c983
         'include': '{userbase}/include/python{py_version_short}',
Matej Stuchlik 2c1c983
         'scripts': '{userbase}/bin',
Matej Stuchlik 2c1c983
         'data': '{userbase}',
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Lib/test/test_site.py.lib64	2013-11-24 21:36:55.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Lib/test/test_site.py	2013-11-27 11:10:43.822150773 +0100
Matej Stuchlik 2c1c983
@@ -244,12 +244,15 @@
Matej Stuchlik 2c1c983
             self.assertEqual(dirs[2], wanted)
Matej Stuchlik 2c1c983
         elif os.sep == '/':
Matej Stuchlik 2c1c983
             # OS X non-framwework builds, Linux, FreeBSD, etc
Matej Stuchlik 2c1c983
-            self.assertEqual(len(dirs), 2)
Matej Stuchlik 2c1c983
-            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
Matej Stuchlik 2c1c983
+            self.assertEqual(len(dirs), 3)
Matej Stuchlik 2c1c983
+            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
Matej Stuchlik 2c1c983
                                   'site-packages')
Matej Stuchlik 2c1c983
             self.assertEqual(dirs[0], wanted)
Matej Stuchlik 2c1c983
-            wanted = os.path.join('xoxo', 'lib', 'site-python')
Matej Stuchlik 2c1c983
+            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
Matej Stuchlik 2c1c983
+                                  'site-packages')
Matej Stuchlik 2c1c983
             self.assertEqual(dirs[1], wanted)
Matej Stuchlik 2c1c983
+            wanted = os.path.join('xoxo', 'lib', 'site-python')
Matej Stuchlik 2c1c983
+            self.assertEqual(dirs[2], wanted)
Matej Stuchlik 2c1c983
         else:
Matej Stuchlik 2c1c983
             # other platforms
Matej Stuchlik 2c1c983
             self.assertEqual(len(dirs), 2)
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Makefile.pre.in.lib64	2013-11-27 11:10:43.814150786 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Makefile.pre.in	2013-11-27 11:10:43.823150771 +0100
Matej Stuchlik 2c1c983
@@ -115,7 +115,7 @@
Matej Stuchlik 2c1c983
 MANDIR=		@mandir@
Matej Stuchlik 2c1c983
 INCLUDEDIR=	@includedir@
Matej Stuchlik 2c1c983
 CONFINCLUDEDIR=	$(exec_prefix)/include
Matej Stuchlik 2c1c983
-SCRIPTDIR=	$(prefix)/lib
Matej Stuchlik 2c1c983
+SCRIPTDIR=	$(prefix)/lib64
Matej Stuchlik 2c1c983
 ABIFLAGS=	@ABIFLAGS@
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 # Detailed destination directories
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/Modules/getpath.c.lib64	2013-11-24 21:36:56.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/Modules/getpath.c	2013-11-27 11:17:33.619449704 +0100
Matej Stuchlik 2c1c983
@@ -122,8 +122,8 @@
Matej Stuchlik 2c1c983
 #endif
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 #ifndef PYTHONPATH
Matej Stuchlik 2c1c983
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
Matej Stuchlik 2c1c983
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
Matej Stuchlik 2c1c983
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
Matej Stuchlik 2c1c983
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
Matej Stuchlik 2c1c983
 #endif
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 #ifndef LANDMARK
Matej Stuchlik 2c1c983
@@ -498,7 +498,7 @@
Matej Stuchlik 2c1c983
     _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
Matej Stuchlik 2c1c983
     _prefix = _Py_char2wchar(PREFIX, NULL);
Matej Stuchlik 2c1c983
     _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
Matej Stuchlik 2c1c983
-    lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
Matej Stuchlik 2c1c983
+    lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
     if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
Matej Stuchlik 2c1c983
         Py_FatalError(
Matej Stuchlik 2c1c983
@@ -687,7 +687,7 @@
Matej Stuchlik 2c1c983
     }
Matej Stuchlik 2c1c983
     else
Matej Stuchlik 2c1c983
         wcsncpy(zip_path, _prefix, MAXPATHLEN);
Matej Stuchlik 2c1c983
-    joinpath(zip_path, L"lib/python00.zip");
Matej Stuchlik 2c1c983
+    joinpath(zip_path, L"lib64/python00.zip");
Matej Stuchlik 2c1c983
     bufsz = wcslen(zip_path);   /* Replace "00" with version */
Matej Stuchlik 2c1c983
     zip_path[bufsz - 6] = VERSION[0];
Matej Stuchlik 2c1c983
     zip_path[bufsz - 5] = VERSION[2];
Matej Stuchlik 2c1c983
@@ -699,7 +699,7 @@
Matej Stuchlik 2c1c983
             fprintf(stderr,
Matej Stuchlik 2c1c983
                 "Could not find platform dependent libraries <exec_prefix>\n");
Matej Stuchlik 2c1c983
         wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
Matej Stuchlik 2c1c983
-        joinpath(exec_prefix, L"lib/lib-dynload");
Matej Stuchlik 2c1c983
+        joinpath(exec_prefix, L"lib64/lib-dynload");
Matej Stuchlik 2c1c983
     }
Matej Stuchlik 2c1c983
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
--- Python-3.4.0b1/setup.py.lib64	2013-11-24 21:36:56.000000000 +0100
Matej Stuchlik 2c1c983
+++ Python-3.4.0b1/setup.py	2013-11-27 11:10:43.824150769 +0100
Matej Stuchlik 2c1c983
@@ -441,7 +441,7 @@
Matej Stuchlik 2c1c983
         # directories (i.e. '.' and 'Include') must be first.  See issue
Matej Stuchlik 2c1c983
         # 10520.
Matej Stuchlik 2c1c983
         if not cross_compiling:
Matej Stuchlik 2c1c983
-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
Matej Stuchlik 2c1c983
+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
Matej Stuchlik 2c1c983
             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
Matej Stuchlik 2c1c983
         # only change this for cross builds for 3.3, issues on Mageia
Matej Stuchlik 2c1c983
         if cross_compiling:
Matej Stuchlik 2c1c983
@@ -718,11 +718,11 @@
Matej Stuchlik 2c1c983
             elif curses_library:
Matej Stuchlik 2c1c983
                 readline_libs.append(curses_library)
Matej Stuchlik 2c1c983
             elif self.compiler.find_library_file(lib_dirs +
Matej Stuchlik 2c1c983
-                                                     ['/usr/lib/termcap'],
Matej Stuchlik 2c1c983
+                                                     ['/usr/lib64/termcap'],
Matej Stuchlik 2c1c983
                                                      'termcap'):
Matej Stuchlik 2c1c983
                 readline_libs.append('termcap')
Matej Stuchlik 2c1c983
             exts.append( Extension('readline', ['readline.c'],
Matej Stuchlik 2c1c983
-                                   library_dirs=['/usr/lib/termcap'],
Matej Stuchlik 2c1c983
+                                   library_dirs=['/usr/lib64/termcap'],
Matej Stuchlik 2c1c983
                                    extra_link_args=readline_extra_link_args,
Matej Stuchlik 2c1c983
                                    libraries=readline_libs) )
Matej Stuchlik 2c1c983
         else:
Matej Stuchlik 2c1c983
@@ -759,8 +759,8 @@
Matej Stuchlik 2c1c983
             if krb5_h:
Matej Stuchlik 2c1c983
                 ssl_incs += krb5_h
Matej Stuchlik 2c1c983
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
Matej Stuchlik 2c1c983
-                                     ['/usr/local/ssl/lib',
Matej Stuchlik 2c1c983
-                                      '/usr/contrib/ssl/lib/'
Matej Stuchlik 2c1c983
+                                     ['/usr/local/ssl/lib64',
Matej Stuchlik 2c1c983
+                                      '/usr/contrib/ssl/lib64/'
Matej Stuchlik 2c1c983
                                      ] )
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
         if (ssl_incs is not None and