diff options
Diffstat (limited to 'dev-lang/python/files/python-2.4-lib64.patch')
| -rw-r--r-- | dev-lang/python/files/python-2.4-lib64.patch | 227 |
1 files changed, 0 insertions, 227 deletions
diff --git a/dev-lang/python/files/python-2.4-lib64.patch b/dev-lang/python/files/python-2.4-lib64.patch deleted file mode 100644 index c3e2c4ffcca9..000000000000 --- a/dev-lang/python/files/python-2.4-lib64.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff -Nru Python-2.4.old/Lib/distutils/command/install.py Lib/distutils/command/install.py ---- Python-2.4.old/Lib/distutils/command/install.py 2004-08-14 21:38:57.318696000 -0400 -+++ Lib/distutils/command/install.py 2004-08-14 21:39:41.285012104 -0400 -@@ -39,14 +39,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', -diff -Nru Python-2.4.old/Lib/distutils/sysconfig.py Lib/distutils/sysconfig.py ---- Python-2.4.old/Lib/distutils/sysconfig.py 2004-08-14 21:38:57.367688552 -0400 -+++ Lib/distutils/sysconfig.py 2004-08-14 21:39:41.300009824 -0400 -@@ -99,8 +99,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: -diff -Nru Lib/site.py.old Lib/site.py ---- Lib/site.py.old 2005-01-05 10:50:32.642936080 -0800 -+++ Lib/site.py 2005-01-05 10:54:44.698617792 -0800 -@@ -179,9 +179,14 @@ - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -+ "lib64", -+ "python" + sys.version[:3], -+ "site-packages"), -+ os.path.join(prefix, - "lib", - "python" + sys.version[:3], - "site-packages"), -+ os.path.join(prefix, "lib64", "site-python"), - os.path.join(prefix, "lib", "site-python")] - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: -diff -Nru Python-2.4.old/Makefile.pre.in Makefile.pre.in ---- Python-2.4.old/Makefile.pre.in 2004-08-14 21:39:00.506211424 -0400 -+++ Makefile.pre.in 2004-08-14 21:39:41.341003592 -0400 -@@ -79,11 +79,11 @@ - - # Expanded directories - BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+LIBDIR= $(exec_prefix)/lib64 - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c ---- Modules/Setup.dist.old 2005-01-05 11:59:12.421634520 -0800 -+++ Modules/Setup.dist 2005-01-05 12:00:58.292539696 -0800 -@@ -325,7 +325,7 @@ - # *** Uncomment and edit to reflect your Tcl/Tk versions: - # -ltk8.2 -ltcl8.2 \ - # *** Uncomment and edit to reflect where your X11 libraries are: --# -L/usr/X11R6/lib \ -+ -L/usr/X11R6/lib64 \ - # *** Or uncomment this for Solaris: - # -L/usr/openwin/lib \ - # *** Uncomment these for TOGL extension only: -@@ -396,7 +396,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 -@@ -442,7 +442,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 - # ---- Python-2.4.old/Modules/getpath.c 2004-08-14 21:39:00.750174336 -0400 -+++ Modules/getpath.c 2004-08-14 21:39:41.319006936 -0400 -@@ -112,8 +112,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ -+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -124,7 +124,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib64/python" VERSION; - - static void - reduce(char *dir) -@@ -492,7 +492,7 @@ - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "lib64/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -502,7 +502,7 @@ - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -Nru setup.py.old setup.py ---- setup.py.old 2005-01-05 12:05:34.809502728 -0800 -+++ setup.py 2005-01-05 12:14:29.522214040 -0800 -@@ -247,7 +247,7 @@ - def detect_modules(self): - global disable_ssl - # 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') - - # Add paths to popular package managers on OS X/darwin -@@ -437,11 +437,11 @@ - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - libraries=readline_libs) ) - if platform not in ['mac']: - # crypt module. -@@ -470,8 +470,8 @@ - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and -@@ -502,23 +502,23 @@ - # order you wish to search - e.g., search for db4 before db3 - db_try_this = { - 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',), -- 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib', -- '/usr/local/BerkeleyDB.4.1/lib', -- '/usr/local/BerkeleyDB.4.0/lib', -- '/usr/local/lib', -+ 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib64', -+ '/usr/local/BerkeleyDB.4.1/lib64', -+ '/usr/local/BerkeleyDB.4.0/lib64', -+ '/usr/local/lib64', - '/opt/sfw', -- '/sw/lib', -+ '/sw/libi64', - ), - 'incdirs': ('/usr/include/db4.2', - '/usr/include/db4.1', - '/usr/include/db4', - )}, - 'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',), -- 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib', -- '/usr/local/BerkeleyDB.3.2/lib', -- '/usr/local/lib', -- '/opt/sfw/lib', -- '/sw/lib', -+ 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64', -+ '/usr/local/BerkeleyDB.3.2/lib64', -+ '/usr/local/lib64', -+ '/opt/sfw/lib64', -+ '/sw/lib64', - ), - 'incdirs': ('/usr/local/BerkeleyDB.3.3/include', - '/usr/local/BerkeleyDB.3.2/include', -@@ -1000,11 +1000,11 @@ - added_lib_dirs.append('/usr/X11R6/lib') - elif os.path.exists('/usr/X11R5/include'): - include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -+ added_lib_dirs.append('/usr/X11R5/lib64') - else: - # Assume default location for X11 - include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -+ added_lib_dirs.append('/usr/X11/lib64') - - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': |