diff options
Diffstat (limited to 'dev-lang/python/files/patches/2.4.1-libdir.patch')
| -rw-r--r-- | dev-lang/python/files/patches/2.4.1-libdir.patch | 176 |
1 files changed, 0 insertions, 176 deletions
diff --git a/dev-lang/python/files/patches/2.4.1-libdir.patch b/dev-lang/python/files/patches/2.4.1-libdir.patch deleted file mode 100644 index 9312ddd..0000000 --- a/dev-lang/python/files/patches/2.4.1-libdir.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- Python-2.4.1/Lib/distutils/command/install.py -+++ Python-2.4.1/Lib/distutils/command/install.py -@@ -39,15 +39,15 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/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', -+ 'purelib': '$base/@@GENTOO_LIBDIR/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/@@GENTOO_LIBDIR@@/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Python-2.4.1/Lib/distutils/sysconfig.py -+++ Python-2.4.1/Lib/distutils/sysconfig.py -@@ -99,9 +99,9 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "@@GENTOO_LIBDIR@@", "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- Python-2.4.1/Lib/site.py -+++ Python-2.4.1/Lib/site.py -@@ -179,10 +179,20 @@ def addsitepackages(known_paths): - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -+ "@@GENTOO_LIBDIR@@", -+ "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")] -+ tmp_sitedirs = [] -+ for sdir in sitedirs: -+ if sdir not in tmp_sitedirs: -+ tmp_sitedirs.append(sdir) -+ sitedirs = tmp_sitedirs - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] ---- Python-2.4.1/Makefile.pre.in -+++ Python-2.4.1/Makefile.pre.in -@@ -79,9 +79,9 @@ exec_prefix= @exec_prefix@ - - # Expanded directories - BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+LIBDIR= $(exec_prefix)/@@GENTOO_LIBDIR@@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include ---- Python-2.4.1/Modules/Setup.dist -+++ Python-2.4.1/Modules/Setup.dist -@@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear - #DB=/usr/local/BerkeleyDB.4.0 - #DBLIBVER=4.0 - #DBINC=$(DB)/include --#DBLIB=$(DB)/lib -+DBLIB=$(DB)/@@GENTOO_LIBDIR@@ - #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -446,7 +446,7 @@ GLHACK=-Dclear=__GLclear - # 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)/@@GENTOO_LIBDIR@@ -lz - - # Interface to the Expat XML parser - # ---- Python-2.4.1/Modules/getpath.c -+++ Python-2.4.1/Modules/getpath.c -@@ -113,7 +113,7 @@ - - #ifndef PYTHONPATH - #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -125,6 +125,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_exec_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -321,7 +322,7 @@ search_for_exec_prefix(char *argv0_path, - strncpy(exec_prefix, delim+1, MAXPATHLEN); - else - strncpy(exec_prefix, home, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - return 1; - } -@@ -338,7 +339,7 @@ search_for_exec_prefix(char *argv0_path, - copy_absolute(exec_prefix, argv0_path); - do { - n = strlen(exec_prefix); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -348,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, - - /* Look at configure's EXEC_PREFIX */ - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -525,7 +526,7 @@ calculate_path(void) - 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, "@@GENTOO_LIBDIR@@/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - ---- Python-2.4.1/setup.py -+++ Python-2.4.1/setup.py -@@ -274,7 +275,7 @@ class PyBuildExt(build_ext): - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -+ '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@', - '/lib', '/usr/lib', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] -@@ -437,11 +438,11 @@ class PyBuildExt(build_ext): - 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/@@GENTOO_LIBDIR@@/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'], - libraries=readline_libs) ) - if platform not in ['mac']: - # crypt module. -@@ -1015,7 +1016,7 @@ class PyBuildExt(build_ext): - added_lib_dirs.append('/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): - include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -+ added_lib_dirs.append('/usr/X11R6/lib') - added_lib_dirs.append('/usr/X11R6/lib') - elif os.path.exists('/usr/X11R5/include'): - include_dirs.append('/usr/X11R5/include') |