diff options
Diffstat (limited to 'source/d/python/python.x86_64.diff')
| -rw-r--r-- | source/d/python/python.x86_64.diff | 213 |
1 files changed, 119 insertions, 94 deletions
diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff index cb6bf2582..0e7c6c45e 100644 --- a/source/d/python/python.x86_64.diff +++ b/source/d/python/python.x86_64.diff @@ -1,11 +1,108 @@ ---- ./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 -uar Python-2.7.2.orig/Lib/distutils/command/install.py Python-2.7.2/Lib/distutils/command/install.py +--- Python-2.7.2.orig/Lib/distutils/command/install.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/command/install.py 2011-06-13 12:29:32.239106481 +0300 +@@ -41,15 +41,15 @@ - # Expanded directories - BINDIR= @bindir@ --LIBDIR= @libdir@ -+LIBDIR= $(exec_prefix)/lib64 + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/lib64/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', ++ 'purelib': '$base/lib64/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -uar Python-2.7.2.orig/Lib/distutils/sysconfig.py Python-2.7.2/Lib/distutils/sysconfig.py +--- Python-2.7.2.orig/Lib/distutils/sysconfig.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/sysconfig.py 2011-06-13 12:29:32.239106481 +0300 +@@ -115,7 +115,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib64", "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -uar Python-2.7.2.orig/Lib/site.py Python-2.7.2/Lib/site.py +--- Python-2.7.2.orig/Lib/site.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/site.py 2011-06-13 12:29:32.239106481 +0300 +@@ -300,13 +300,13 @@ + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': +- sitepackages.append(os.path.join(prefix, "lib", ++ sitepackages.append(os.path.join(prefix, "lib64", + "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, "lib", "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple + # locations. +diff -uar Python-2.7.2.orig/Lib/sysconfig.py Python-2.7.2/Lib/sysconfig.py +--- Python-2.7.2.orig/Lib/sysconfig.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/sysconfig.py 2011-06-13 12:29:32.240106474 +0300 +@@ -7,20 +7,20 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', ++ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', +- 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', ++ 'purelib': '{base}/lib64/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', ++ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +diff -uar Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in +--- Python-2.7.2.orig/Makefile.pre.in 2011-06-11 18:46:26.000000000 +0300 ++++ Python-2.7.2/Makefile.pre.in 2011-06-13 12:29:32.240106474 +0300 +@@ -97,7 +97,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -14,8 +111,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 -uar Python-2.7.2.orig/Modules/getpath.c Python-2.7.2/Modules/getpath.c +--- Python-2.7.2.orig/Modules/getpath.c 2011-06-11 18:46:27.000000000 +0300 ++++ Python-2.7.2/Modules/getpath.c 2011-06-13 12:29:32.240106474 +0300 @@ -117,8 +117,8 @@ #endif @@ -36,7 +134,7 @@ static void reduce(char *dir) -@@ -524,7 +524,7 @@ +@@ -528,7 +528,7 @@ } else strncpy(zip_path, PREFIX, MAXPATHLEN); @@ -45,7 +143,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 @@ fprintf(stderr, "Could not find platform dependent libraries <exec_prefix>\n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); @@ -54,44 +152,25 @@ } /* 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) - - # Historical Berkeley DB 1.85 -@@ -460,7 +460,7 @@ - # 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 - - # Interface to the Expat XML parser - # ---- ./setup.py.orig 2010-07-17 07:31:09.000000000 -0500 -+++ ./setup.py 2010-11-27 17:21:23.000000000 -0600 -@@ -356,7 +356,7 @@ +diff -uar Python-2.7.2.orig/setup.py Python-2.7.2/setup.py +--- Python-2.7.2.orig/setup.py 2011-06-11 18:46:28.000000000 +0300 ++++ Python-2.7.2/setup.py 2011-06-13 12:29:32.241106466 +0300 +@@ -369,7 +369,7 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() - # Add paths specified in the environment variables LDFLAGS and -@@ -662,11 +662,11 @@ +@@ -677,11 +677,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], @@ -99,7 +178,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -703,8 +703,8 @@ +@@ -715,8 +715,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -110,57 +189,3 @@ ] ) 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-03-21 09:02:32.000000000 -0500 -+++ ./Lib/site.py 2010-11-27 17:21:23.000000000 -0600 -@@ -265,12 +265,16 @@ - if sys.platform in ('os2emx', 'riscos'): - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitedirs.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) - else: - sitedirs.append(prefix) -+ sitedirs.append(os.path.join(prefix, "lib64", "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) - - if sys.platform == "darwin": |