Blame SOURCES/python-2.7.3-lib64.patch

6e8c2f
diff -up Python-2.7.3/Lib/distutils/command/install.py.lib64 Python-2.7.3/Lib/distutils/command/install.py
6e8c2f
--- Python-2.7.3/Lib/distutils/command/install.py.lib64	2012-04-09 19:07:29.000000000 -0400
6e8c2f
+++ Python-2.7.3/Lib/distutils/command/install.py	2013-02-19 13:58:20.446015129 -0500
6e8c2f
@@ -42,14 +42,14 @@ else:
6e8c2f
 INSTALL_SCHEMES = {
6e8c2f
     'unix_prefix': {
6e8c2f
         'purelib': '$base/lib/python$py_version_short/site-packages',
6e8c2f
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
6e8c2f
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
6e8c2f
         'headers': '$base/include/python$py_version_short/$dist_name',
6e8c2f
         'scripts': '$base/bin',
6e8c2f
         'data'   : '$base',
6e8c2f
         },
6e8c2f
     'unix_home': {
6e8c2f
         'purelib': '$base/lib/python',
6e8c2f
-        'platlib': '$base/lib/python',
6e8c2f
+        'platlib': '$base/lib64/python',
6e8c2f
         'headers': '$base/include/python/$dist_name',
6e8c2f
         'scripts': '$base/bin',
6e8c2f
         'data'   : '$base',
6e8c2f
diff -up Python-2.7.3/Lib/distutils/sysconfig.py.lib64 Python-2.7.3/Lib/distutils/sysconfig.py
6e8c2f
--- Python-2.7.3/Lib/distutils/sysconfig.py.lib64	2012-04-09 19:07:29.000000000 -0400
6e8c2f
+++ Python-2.7.3/Lib/distutils/sysconfig.py	2013-02-19 13:58:20.446015129 -0500
6e8c2f
@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan
6e8c2f
         prefix = plat_specific and EXEC_PREFIX or PREFIX
6e8c2f
 
6e8c2f
     if os.name == "posix":
6e8c2f
+        if plat_specific or standard_lib:
6e8c2f
+            lib = "lib64"
6e8c2f
+        else:
6e8c2f
+            lib = "lib"
6e8c2f
         libpython = os.path.join(prefix,
6e8c2f
-                                 "lib", "python" + get_python_version())
6e8c2f
+                                 lib, "python" + get_python_version())
6e8c2f
         if standard_lib:
6e8c2f
             return libpython
6e8c2f
         else:
6e8c2f
diff -up Python-2.7.3/Lib/site.py.lib64 Python-2.7.3/Lib/site.py
6e8c2f
--- Python-2.7.3/Lib/site.py.lib64	2012-04-09 19:07:31.000000000 -0400
6e8c2f
+++ Python-2.7.3/Lib/site.py	2013-02-19 13:58:20.447015128 -0500
6e8c2f
@@ -300,12 +300,16 @@ def getsitepackages():
6e8c2f
         if sys.platform in ('os2emx', 'riscos'):
6e8c2f
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
6e8c2f
         elif os.sep == '/':
6e8c2f
+            sitepackages.append(os.path.join(prefix, "lib64",
6e8c2f
+                                        "python" + sys.version[:3],
6e8c2f
+                                        "site-packages"))
6e8c2f
             sitepackages.append(os.path.join(prefix, "lib",
6e8c2f
                                         "python" + sys.version[:3],
6e8c2f
                                         "site-packages"))
6e8c2f
             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
6e8c2f
         else:
6e8c2f
             sitepackages.append(prefix)
6e8c2f
+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
6e8c2f
             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
6e8c2f
         if sys.platform == "darwin":
6e8c2f
             # for framework builds *only* we add the standard Apple
6e8c2f
diff -up Python-2.7.3/Lib/test/test_site.py.lib64 Python-2.7.3/Lib/test/test_site.py
6e8c2f
--- Python-2.7.3/Lib/test/test_site.py.lib64	2012-04-09 19:07:32.000000000 -0400
6e8c2f
+++ Python-2.7.3/Lib/test/test_site.py	2013-02-19 13:58:20.447015128 -0500
6e8c2f
@@ -241,17 +241,20 @@ class HelperFunctionsTests(unittest.Test
6e8c2f
             self.assertEqual(dirs[2], wanted)
6e8c2f
         elif os.sep == '/':
6e8c2f
             # OS X non-framwework builds, Linux, FreeBSD, etc
6e8c2f
-            self.assertEqual(len(dirs), 2)
6e8c2f
-            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
6e8c2f
+            self.assertEqual(len(dirs), 3)
6e8c2f
+            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
6e8c2f
                                   'site-packages')
6e8c2f
             self.assertEqual(dirs[0], wanted)
6e8c2f
-            wanted = os.path.join('xoxo', 'lib', 'site-python')
6e8c2f
+            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
6e8c2f
+                                  'site-packages')
6e8c2f
             self.assertEqual(dirs[1], wanted)
6e8c2f
+            wanted = os.path.join('xoxo', 'lib', 'site-python')
6e8c2f
+            self.assertEqual(dirs[2], wanted)
6e8c2f
         else:
6e8c2f
             # other platforms
6e8c2f
             self.assertEqual(len(dirs), 2)
6e8c2f
             self.assertEqual(dirs[0], 'xoxo')
6e8c2f
-            wanted = os.path.join('xoxo', 'lib', 'site-packages')
6e8c2f
+            wanted = os.path.join('xoxo', 'lib64', 'site-packages')
6e8c2f
             self.assertEqual(dirs[1], wanted)
6e8c2f
 
6e8c2f
 class PthFile(object):
6e8c2f
diff -up Python-2.7.3/Makefile.pre.in.lib64 Python-2.7.3/Makefile.pre.in
6e8c2f
--- Python-2.7.3/Makefile.pre.in.lib64	2013-02-19 13:58:20.435015131 -0500
6e8c2f
+++ Python-2.7.3/Makefile.pre.in	2013-02-19 13:58:20.447015128 -0500
6e8c2f
@@ -97,7 +97,7 @@ LIBDIR=		@libdir@
6e8c2f
 MANDIR=		@mandir@
6e8c2f
 INCLUDEDIR=	@includedir@
6e8c2f
 CONFINCLUDEDIR=	$(exec_prefix)/include
6e8c2f
-SCRIPTDIR=	$(prefix)/lib
6e8c2f
+SCRIPTDIR=	$(prefix)/lib64
6e8c2f
 
6e8c2f
 # Detailed destination directories
6e8c2f
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
6e8c2f
diff -up Python-2.7.3/Modules/getpath.c.lib64 Python-2.7.3/Modules/getpath.c
6e8c2f
--- Python-2.7.3/Modules/getpath.c.lib64	2012-04-09 19:07:34.000000000 -0400
6e8c2f
+++ Python-2.7.3/Modules/getpath.c	2013-02-19 13:58:20.448015128 -0500
6e8c2f
@@ -117,8 +117,8 @@
6e8c2f
 #endif
6e8c2f
 
6e8c2f
 #ifndef PYTHONPATH
6e8c2f
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
6e8c2f
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
6e8c2f
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
6e8c2f
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
6e8c2f
 #endif
6e8c2f
 
6e8c2f
 #ifndef LANDMARK
6e8c2f
@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1];
6e8c2f
 static char exec_prefix[MAXPATHLEN+1];
6e8c2f
 static char progpath[MAXPATHLEN+1];
6e8c2f
 static char *module_search_path = NULL;
6e8c2f
-static char lib_python[] = "lib/python" VERSION;
6e8c2f
+static char lib_python[] = "lib64/python" VERSION;
6e8c2f
 
6e8c2f
 static void
6e8c2f
 reduce(char *dir)
6e8c2f
@@ -528,7 +528,7 @@ calculate_path(void)
6e8c2f
     }
6e8c2f
     else
6e8c2f
         strncpy(zip_path, PREFIX, MAXPATHLEN);
6e8c2f
-    joinpath(zip_path, "lib/python00.zip");
6e8c2f
+    joinpath(zip_path, "lib64/python00.zip");
6e8c2f
     bufsz = strlen(zip_path);   /* Replace "00" with version */
6e8c2f
     zip_path[bufsz - 6] = VERSION[0];
6e8c2f
     zip_path[bufsz - 5] = VERSION[2];
6e8c2f
@@ -538,7 +538,7 @@ calculate_path(void)
6e8c2f
             fprintf(stderr,
6e8c2f
                 "Could not find platform dependent libraries <exec_prefix>\n");
6e8c2f
         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
6e8c2f
-        joinpath(exec_prefix, "lib/lib-dynload");
6e8c2f
+        joinpath(exec_prefix, "lib64/lib-dynload");
6e8c2f
     }
6e8c2f
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
6e8c2f
 
6e8c2f
diff -up Python-2.7.3/Modules/Setup.dist.lib64 Python-2.7.3/Modules/Setup.dist
6e8c2f
--- Python-2.7.3/Modules/Setup.dist.lib64	2013-02-19 13:58:20.442015131 -0500
6e8c2f
+++ Python-2.7.3/Modules/Setup.dist	2013-02-19 14:02:25.255998391 -0500
6e8c2f
@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm
6e8c2f
 # Edit the variables DB and DBLIBVERto point to the db top directory
6e8c2f
 # and the subdirectory of PORT where you built it.
6e8c2f
 DBINC=/usr/include/libdb
6e8c2f
-DBLIB=/usr/lib
6e8c2f
+DBLIB=/usr/lib64
6e8c2f
 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb
6e8c2f
 
6e8c2f
 # Historical Berkeley DB 1.85
6e8c2f
@@ -459,7 +459,7 @@ cPickle cPickle.c
6e8c2f
 # Andrew Kuchling's zlib module.
6e8c2f
 # This require zlib 1.1.3 (or later).
6e8c2f
 # See http://www.gzip.org/zlib/
6e8c2f
-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
6e8c2f
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
6e8c2f
 
6e8c2f
 # Interface to the Expat XML parser
6e8c2f
 #
6e8c2f
diff -up Python-2.7.3/setup.py.lib64 Python-2.7.3/setup.py
6e8c2f
--- Python-2.7.3/setup.py.lib64	2012-04-09 19:07:36.000000000 -0400
6e8c2f
+++ Python-2.7.3/setup.py	2013-02-19 13:58:20.449015129 -0500
6e8c2f
@@ -369,7 +369,7 @@ class PyBuildExt(build_ext):
6e8c2f
 
6e8c2f
     def detect_modules(self):
6e8c2f
         # Ensure that /usr/local is always used
6e8c2f
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
6e8c2f
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
6e8c2f
         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
6e8c2f
         self.add_gcc_paths()
6e8c2f
         self.add_multiarch_paths()
6e8c2f
@@ -677,11 +677,11 @@ class PyBuildExt(build_ext):
6e8c2f
             elif curses_library:
6e8c2f
                 readline_libs.append(curses_library)
6e8c2f
             elif self.compiler.find_library_file(lib_dirs +
6e8c2f
-                                                     ['/usr/lib/termcap'],
6e8c2f
+                                                     ['/usr/lib64/termcap'],
6e8c2f
                                                      'termcap'):
6e8c2f
                 readline_libs.append('termcap')
6e8c2f
             exts.append( Extension('readline', ['readline.c'],
6e8c2f
-                                   library_dirs=['/usr/lib/termcap'],
6e8c2f
+                                   library_dirs=['/usr/lib64/termcap'],
6e8c2f
                                    extra_link_args=readline_extra_link_args,
6e8c2f
                                    libraries=readline_libs) )
6e8c2f
         else:
6e8c2f
@@ -715,8 +715,8 @@ class PyBuildExt(build_ext):
6e8c2f
             if krb5_h:
6e8c2f
                 ssl_incs += krb5_h
6e8c2f
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
6e8c2f
-                                     ['/usr/local/ssl/lib',
6e8c2f
-                                      '/usr/contrib/ssl/lib/'
6e8c2f
+                                     ['/usr/local/ssl/lib64',
6e8c2f
+                                      '/usr/contrib/ssl/lib64/'
6e8c2f
                                      ] )
6e8c2f
 
6e8c2f
         if (ssl_incs is not None and