Blame SOURCES/00102-lib64.patch

2a6dbc
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
e7f125
index 0258d3d..4b969bf 100644
2a6dbc
--- a/Lib/distutils/command/install.py
2a6dbc
+++ b/Lib/distutils/command/install.py
2a6dbc
@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
2a6dbc
 INSTALL_SCHEMES = {
2a6dbc
     'unix_prefix': {
2a6dbc
         'purelib': '$base/lib/python$py_version_short/site-packages',
2a6dbc
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
2a6dbc
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
2a6dbc
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
2a6dbc
         'scripts': '$base/bin',
2a6dbc
         'data'   : '$base',
2a6dbc
         },
2a6dbc
     'unix_home': {
2a6dbc
         'purelib': '$base/lib/python',
2a6dbc
-        'platlib': '$base/lib/python',
2a6dbc
+        'platlib': '$base/lib64/python',
2a6dbc
         'headers': '$base/include/python/$dist_name',
2a6dbc
         'scripts': '$base/bin',
2a6dbc
         'data'   : '$base',
2a6dbc
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
e7f125
index 5c2670f..2013efa 100644
2a6dbc
--- a/Lib/distutils/sysconfig.py
2a6dbc
+++ b/Lib/distutils/sysconfig.py
e7f125
@@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
2a6dbc
             prefix = plat_specific and EXEC_PREFIX or PREFIX
2a6dbc
 
2a6dbc
     if os.name == "posix":
2a6dbc
+        if plat_specific or standard_lib:
2a6dbc
+            lib = "lib64"
2a6dbc
+        else:
2a6dbc
+            lib = "lib"
2a6dbc
         libpython = os.path.join(prefix,
2a6dbc
-                                 "lib", "python" + get_python_version())
2a6dbc
+                                 lib, "python" + get_python_version())
2a6dbc
         if standard_lib:
2a6dbc
             return libpython
2a6dbc
         else:
2a6dbc
diff --git a/Lib/site.py b/Lib/site.py
e7f125
index 86ca2db..58115f1 100644
2a6dbc
--- a/Lib/site.py
2a6dbc
+++ b/Lib/site.py
e7f125
@@ -304,11 +304,15 @@ def getsitepackages(prefixes=None):
2a6dbc
         seen.add(prefix)
2a6dbc
 
2a6dbc
         if os.sep == '/':
2a6dbc
+            sitepackages.append(os.path.join(prefix, "lib64",
2a6dbc
+                                        "python" + sys.version[:3],
2a6dbc
+                                        "site-packages"))
2a6dbc
             sitepackages.append(os.path.join(prefix, "lib",
2a6dbc
                                         "python%d.%d" % sys.version_info[:2],
2a6dbc
                                         "site-packages"))
2a6dbc
         else:
2a6dbc
             sitepackages.append(prefix)
2a6dbc
+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
2a6dbc
             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
2a6dbc
         if sys.platform == "darwin":
2a6dbc
             # for framework builds *only* we add the standard Apple
2a6dbc
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
e7f125
index d35b5eb..240bb66 100644
2a6dbc
--- a/Lib/sysconfig.py
2a6dbc
+++ b/Lib/sysconfig.py
2a6dbc
@@ -20,10 +20,10 @@ __all__ = [
2a6dbc
 
2a6dbc
 _INSTALL_SCHEMES = {
2a6dbc
     'posix_prefix': {
2a6dbc
-        'stdlib': '{installed_base}/lib/python{py_version_short}',
2a6dbc
-        'platstdlib': '{platbase}/lib/python{py_version_short}',
2a6dbc
+        'stdlib': '{installed_base}/lib64/python{py_version_short}',
2a6dbc
+        'platstdlib': '{platbase}/lib64/python{py_version_short}',
2a6dbc
         'purelib': '{base}/lib/python{py_version_short}/site-packages',
2a6dbc
-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
2a6dbc
+        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
2a6dbc
         'include':
2a6dbc
             '{installed_base}/include/python{py_version_short}{abiflags}',
2a6dbc
         'platinclude':
2a6dbc
@@ -61,10 +61,10 @@ _INSTALL_SCHEMES = {
2a6dbc
         'data': '{userbase}',
2a6dbc
         },
2a6dbc
     'posix_user': {
2a6dbc
-        'stdlib': '{userbase}/lib/python{py_version_short}',
2a6dbc
-        'platstdlib': '{userbase}/lib/python{py_version_short}',
2a6dbc
+        'stdlib': '{userbase}/lib64/python{py_version_short}',
2a6dbc
+        'platstdlib': '{userbase}/lib64/python{py_version_short}',
2a6dbc
         'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
2a6dbc
-        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
2a6dbc
+        'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
2a6dbc
         'include': '{userbase}/include/python{py_version_short}',
2a6dbc
         'scripts': '{userbase}/bin',
2a6dbc
         'data': '{userbase}',
2a6dbc
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
e7f125
index 6964a84..d0cd84f 100644
2a6dbc
--- a/Lib/test/test_site.py
2a6dbc
+++ b/Lib/test/test_site.py
e7f125
@@ -264,8 +264,8 @@ class HelperFunctionsTests(unittest.TestCase):
2a6dbc
             self.assertEqual(dirs[1], wanted)
2a6dbc
         elif os.sep == '/':
e7f125
             # OS X non-framework builds, Linux, FreeBSD, etc
2a6dbc
-            self.assertEqual(len(dirs), 1)
2a6dbc
-            wanted = os.path.join('xoxo', 'lib',
2a6dbc
+            self.assertEqual(len(dirs), 2)
2a6dbc
+            wanted = os.path.join('xoxo', 'lib64',
2a6dbc
                                   'python%d.%d' % sys.version_info[:2],
2a6dbc
                                   'site-packages')
2a6dbc
             self.assertEqual(dirs[0], wanted)
2a6dbc
diff --git a/Makefile.pre.in b/Makefile.pre.in
e7f125
index f380399..a545318 100644
2a6dbc
--- a/Makefile.pre.in
2a6dbc
+++ b/Makefile.pre.in
e7f125
@@ -139,7 +139,7 @@ LIBDIR=		@libdir@
2a6dbc
 MANDIR=		@mandir@
2a6dbc
 INCLUDEDIR=	@includedir@
2a6dbc
 CONFINCLUDEDIR=	$(exec_prefix)/include
2a6dbc
-SCRIPTDIR=	$(prefix)/lib
2a6dbc
+SCRIPTDIR=	$(prefix)/lib64
2a6dbc
 ABIFLAGS=	@ABIFLAGS@
2a6dbc
 
2a6dbc
 # Detailed destination directories
2a6dbc
diff --git a/Modules/getpath.c b/Modules/getpath.c
e7f125
index dd3387a..1258fcd 100644
2a6dbc
--- a/Modules/getpath.c
2a6dbc
+++ b/Modules/getpath.c
2a6dbc
@@ -494,7 +494,7 @@ calculate_path(void)
2a6dbc
     _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
2a6dbc
     _prefix = Py_DecodeLocale(PREFIX, NULL);
2a6dbc
     _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
2a6dbc
-    lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
2a6dbc
+    lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
2a6dbc
 
2a6dbc
     if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
2a6dbc
         Py_FatalError(
2a6dbc
@@ -683,7 +683,7 @@ calculate_path(void)
2a6dbc
     }
2a6dbc
     else
2a6dbc
         wcsncpy(zip_path, _prefix, MAXPATHLEN);
2a6dbc
-    joinpath(zip_path, L"lib/python00.zip");
2a6dbc
+    joinpath(zip_path, L"lib64/python00.zip");
2a6dbc
     bufsz = wcslen(zip_path);   /* Replace "00" with version */
2a6dbc
     zip_path[bufsz - 6] = VERSION[0];
2a6dbc
     zip_path[bufsz - 5] = VERSION[2];
2a6dbc
@@ -695,7 +695,7 @@ calculate_path(void)
2a6dbc
             fprintf(stderr,
2a6dbc
                 "Could not find platform dependent libraries <exec_prefix>\n");
2a6dbc
         wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
2a6dbc
-        joinpath(exec_prefix, L"lib/lib-dynload");
2a6dbc
+        joinpath(exec_prefix, L"lib64/lib-dynload");
2a6dbc
     }
2a6dbc
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
2a6dbc
 
2a6dbc
diff --git a/setup.py b/setup.py
e7f125
index e2c1898..64d948d 100644
2a6dbc
--- a/setup.py
2a6dbc
+++ b/setup.py
e7f125
@@ -521,7 +521,7 @@ class PyBuildExt(build_ext):
2a6dbc
         # directories (i.e. '.' and 'Include') must be first.  See issue
2a6dbc
         # 10520.
2a6dbc
         if not cross_compiling:
2a6dbc
-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
2a6dbc
+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
2a6dbc
             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
2a6dbc
         # only change this for cross builds for 3.3, issues on Mageia
2a6dbc
         if cross_compiling:
e7f125
@@ -818,11 +818,11 @@ class PyBuildExt(build_ext):
2a6dbc
             elif curses_library:
2a6dbc
                 readline_libs.append(curses_library)
2a6dbc
             elif self.compiler.find_library_file(lib_dirs +
2a6dbc
-                                                     ['/usr/lib/termcap'],
2a6dbc
+                                                     ['/usr/lib64/termcap'],
2a6dbc
                                                      'termcap'):
2a6dbc
                 readline_libs.append('termcap')
2a6dbc
             exts.append( Extension('readline', ['readline.c'],
2a6dbc
-                                   library_dirs=['/usr/lib/termcap'],
2a6dbc
+                                   library_dirs=['/usr/lib64/termcap'],
2a6dbc
                                    extra_link_args=readline_extra_link_args,
2a6dbc
                                    libraries=readline_libs) )
2a6dbc
         else:
e7f125
@@ -859,8 +859,8 @@ class PyBuildExt(build_ext):
2a6dbc
             if krb5_h:
2a6dbc
                 ssl_incs += krb5_h
2a6dbc
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
2a6dbc
-                                     ['/usr/local/ssl/lib',
2a6dbc
-                                      '/usr/contrib/ssl/lib/'
2a6dbc
+                                     ['/usr/local/ssl/lib64',
2a6dbc
+                                      '/usr/contrib/ssl/lib64/'
2a6dbc
                                      ] )
2a6dbc
 
2a6dbc
         if (ssl_incs is not None and