Take the fedora .diff file

1 files changed, 117 insertions, 83 deletions

diff --git a/python27/build/python-2.7.1.x86_64.diff b/python27/build/python-2.7.1.x86_64.diff
index 96402442..21649510 100644
--- a/python27/build/python-2.7.1.x86_64.diff
+++ b/python27/build/python-2.7.1.x86_64.diff
@@ -1,11 +1,95 @@
---- ./Makefile.pre.in.orig	2010-08-01 17:05:31.000000000 -0500
-+++ ./Makefile.pre.in	2010-11-27 17:22:05.000000000 -0600
-@@ -87,11 +87,11 @@
+diff -up Python-2.7.1/Lib/distutils/command/install.py.lib64 Python-2.7.1/Lib/distutils/command/install.py
+--- Python-2.7.1/Lib/distutils/command/install.py.lib64	2010-05-05 15:09:31.000000000 -0400
++++ Python-2.7.1/Lib/distutils/command/install.py	2010-12-23 15:51:19.422062062 -0500
+@@ -42,14 +42,14 @@ else:
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+diff -up Python-2.7.1/Lib/distutils/sysconfig.py.lib64 Python-2.7.1/Lib/distutils/sysconfig.py
+--- Python-2.7.1/Lib/distutils/sysconfig.py.lib64	2010-11-06 10:16:30.000000000 -0400
++++ Python-2.7.1/Lib/distutils/sysconfig.py	2010-12-23 15:51:19.423063652 -0500
+@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
++        if plat_specific or standard_lib:
++            lib = "lib64"
++        else:
++            lib = "lib"
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 lib, "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py
+--- Python-2.7.1/Lib/site.py.lib64	2010-10-12 18:53:51.000000000 -0400
++++ Python-2.7.1/Lib/site.py	2010-12-23 15:51:19.424063606 -0500
+@@ -290,12 +290,16 @@ def getsitepackages():
+         if sys.platform in ('os2emx', 'riscos'):
+             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+         elif os.sep == '/':
++            sitepackages.append(os.path.join(prefix, "lib64",
++                                        "python" + sys.version[:3],
++                                        "site-packages"))
+             sitepackages.append(os.path.join(prefix, "lib",
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
+             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+         else:
+             sitepackages.append(prefix)
++            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
+             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+         if sys.platform == "darwin":
+             # for framework builds *only* we add the standard Apple
+diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py
+--- Python-2.7.1/Lib/test/test_site.py.lib64	2010-11-21 08:34:58.000000000 -0500
++++ Python-2.7.1/Lib/test/test_site.py	2010-12-23 15:55:19.782935931 -0500
+@@ -169,17 +169,20 @@ class HelperFunctionsTests(unittest.Test
+             wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+             self.assertEqual(dirs[0], wanted)
+         elif os.sep == '/':
+-            self.assertEqual(len(dirs), 2)
++            self.assertEquals(len(dirs), 3)
++            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
++                                  'site-packages')
++            self.assertEquals(dirs[0], wanted)
+             wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+                                   'site-packages')
+-            self.assertEqual(dirs[0], wanted)
++            self.assertEquals(dirs[1], wanted)
+             wanted = os.path.join('xoxo', 'lib', 'site-python')
+-            self.assertEqual(dirs[1], wanted)
++            self.assertEquals(dirs[2], wanted)
+         else:
+-            self.assertEqual(len(dirs), 2)
+-            self.assertEqual(dirs[0], 'xoxo')
+-            wanted = os.path.join('xoxo', 'lib', 'site-packages')
+-            self.assertEqual(dirs[1], wanted)
++            self.assertEquals(len(dirs), 2)
++            self.assertEquals(dirs[0], 'xoxo')
++            wanted = os.path.join('xoxo', 'lib64', 'site-packages')
++            self.assertEquals(dirs[1], wanted)
  
- # Expanded directories
- BINDIR=		@bindir@
--LIBDIR=		@libdir@
-+LIBDIR=		$(exec_prefix)/lib64
+         # let's try the specific Apple location
+         if (sys.platform == "darwin" and
+diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in
+--- Python-2.7.1/Makefile.pre.in.lib64	2010-12-23 15:51:19.407063264 -0500
++++ Python-2.7.1/Makefile.pre.in	2010-12-23 15:51:19.426063917 -0500
+@@ -94,7 +94,7 @@ LIBDIR=		@libdir@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -14,8 +98,9 @@
  
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
---- ./Modules/getpath.c.orig	2010-07-24 05:09:36.000000000 -0500
-+++ ./Modules/getpath.c	2010-11-27 17:23:13.000000000 -0600
+diff -up Python-2.7.1/Modules/getpath.c.lib64 Python-2.7.1/Modules/getpath.c
+--- Python-2.7.1/Modules/getpath.c.lib64	2010-10-07 19:37:08.000000000 -0400
++++ Python-2.7.1/Modules/getpath.c	2010-12-23 15:51:19.427063291 -0500
 @@ -117,8 +117,8 @@
  #endif
  
@@ -27,7 +112,7 @@
  #endif
  
  #ifndef LANDMARK
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1];
  static char exec_prefix[MAXPATHLEN+1];
  static char progpath[MAXPATHLEN+1];
  static char *module_search_path = NULL;
@@ -36,7 +121,7 @@
  
  static void
  reduce(char *dir)
-@@ -524,7 +524,7 @@
+@@ -528,7 +528,7 @@ calculate_path(void)
      }
      else
          strncpy(zip_path, PREFIX, MAXPATHLEN);
@@ -45,7 +130,7 @@
      bufsz = strlen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
-@@ -534,7 +534,7 @@
+@@ -538,7 +538,7 @@ calculate_path(void)
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
@@ -54,29 +139,31 @@
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
---- ./Modules/Setup.dist.orig	2008-11-27 04:15:12.000000000 -0600
-+++ ./Modules/Setup.dist	2010-11-27 17:21:23.000000000 -0600
-@@ -414,7 +414,7 @@
- #DB=/usr/local/BerkeleyDB.4.0
- #DBLIBVER=4.0
- #DBINC=$(DB)/include
--#DBLIB=$(DB)/lib
-+#DBLIB=$(DB)/lib64
- #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+diff -up Python-2.7.1/Modules/Setup.dist.lib64 Python-2.7.1/Modules/Setup.dist
+--- Python-2.7.1/Modules/Setup.dist.lib64	2010-12-23 15:51:19.400104130 -0500
++++ Python-2.7.1/Modules/Setup.dist	2010-12-23 15:51:19.427063291 -0500
+@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm
+ # and the subdirectory of PORT where you built it.
+ DBLIBVER=4.7
+ DBINC=/usr/include/db4
+-DBLIB=/usr/lib
++DBLIB=/usr/lib64
+ _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
  
  # Historical Berkeley DB 1.85
-@@ -460,7 +460,7 @@
+@@ -459,7 +459,7 @@ cPickle cPickle.c
  # Andrew Kuchling's zlib module.
  # This require zlib 1.1.3 (or later).
  # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
  
  # Interface to the Expat XML parser
  #
---- ./setup.py.orig	2010-10-31 17:40:21.000000000 +0100
-+++ ./setup.py	2011-05-15 23:18:35.702158677 +0200
-@@ -347,7 +347,7 @@
+diff -up Python-2.7.1/setup.py.lib64 Python-2.7.1/setup.py
+--- Python-2.7.1/setup.py.lib64	2010-10-31 12:40:21.000000000 -0400
++++ Python-2.7.1/setup.py	2010-12-23 15:51:19.428064129 -0500
+@@ -347,7 +347,7 @@ class PyBuildExt(build_ext):
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -85,7 +172,7 @@
          add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -654,11 +654,11 @@
+@@ -654,11 +654,11 @@ class PyBuildExt(build_ext):
              elif curses_library:
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
@@ -99,7 +186,7 @@
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -692,8 +692,8 @@
+@@ -692,8 +692,8 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -110,57 +197,4 @@
                                       ] )
  
          if (ssl_incs is not None and
---- ./Lib/distutils/command/install.py.orig	2008-05-06 17:41:46.000000000 -0500
-+++ ./Lib/distutils/command/install.py	2010-11-27 17:21:23.000000000 -0600
-@@ -42,14 +42,14 @@
- INSTALL_SCHEMES = {
-     'unix_prefix': {
-         'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
-         'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'platlib': '$base/lib64/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
---- ./Lib/distutils/sysconfig.py.orig	2010-08-03 16:18:06.000000000 -0500
-+++ ./Lib/distutils/sysconfig.py	2010-11-27 17:21:23.000000000 -0600
-@@ -119,8 +119,12 @@
-         prefix = plat_specific and EXEC_PREFIX or PREFIX
- 
-     if os.name == "posix":
-+        if plat_specific or standard_lib:
-+            lib = "lib64"
-+        else:
-+            lib = "lib"
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 lib, "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
---- ./Lib/site.py.orig	2010-10-13 00:53:51.000000000 +0200
-+++ ./Lib/site.py	2011-05-15 23:23:13.287993230 +0200
-@@ -290,12 +290,16 @@
-         if sys.platform in ('os2emx', 'riscos'):
-             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-         elif os.sep == '/':
-+            sitepackages.append(os.path.join(prefix, "lib64",
-+                                        "python" + sys.version[:3],
-+                                        "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib",
-                                         "python" + sys.version[:3],
-                                         "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-         else:
-             sitepackages.append(prefix)
-+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-         if sys.platform == "darwin":
-             # for framework builds *only* we add the standard Apple
+