diff options
Diffstat (limited to 'dev-lang/python/files/3.3/03_all_libdir.patch')
| -rw-r--r-- | dev-lang/python/files/3.3/03_all_libdir.patch | 174 |
1 files changed, 0 insertions, 174 deletions
diff --git a/dev-lang/python/files/3.3/03_all_libdir.patch b/dev-lang/python/files/3.3/03_all_libdir.patch deleted file mode 100644 index 052c51d..0000000 --- a/dev-lang/python/files/3.3/03_all_libdir.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- Lib/distutils/command/install.py -+++ Lib/distutils/command/install.py -@@ -44,8 +44,8 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', -+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Lib/distutils/sysconfig.py -+++ Lib/distutils/sysconfig.py -@@ -144,7 +144,7 @@ - - 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: ---- Lib/site.py -+++ Lib/site.py -@@ -303,10 +303,10 @@ - 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, "@@GENTOO_LIBDIR@@", - "python" + sys.version[:3], - "site-packages")) -- sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python")) - else: - sitepackages.append(prefix) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) ---- Lib/sysconfig.py -+++ Lib/sysconfig.py -@@ -21,10 +21,10 @@ - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{installed_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': '{installed_base}/@@GENTOO_LIBDIR@@/python{py_version_short}', -+ 'platstdlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}', -+ 'purelib': '{base}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages', - 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', - 'platinclude': -@@ -81,10 +81,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}/@@GENTOO_LIBDIR@@/python{py_version_short}', -+ 'platstdlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}', -+ 'purelib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data': '{userbase}', ---- Lib/test/test_site.py -+++ Lib/test/test_site.py -@@ -248,10 +248,10 @@ - elif os.sep == '/': - # OS X non-framwework builds, Linux, FreeBSD, etc - self.assertEqual(len(dirs), 2) -- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], -+ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'python' + sys.version[:3], - 'site-packages') - self.assertEqual(dirs[0], wanted) -- wanted = os.path.join('xoxo', 'lib', 'site-python') -+ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'site-python') - self.assertEqual(dirs[1], wanted) - else: - # other platforms ---- Makefile.pre.in -+++ Makefile.pre.in -@@ -115,7 +115,7 @@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@ - ABIFLAGS= @ABIFLAGS@ - - # Detailed destination directories ---- Modules/getpath.c -+++ Modules/getpath.c -@@ -122,8 +122,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION ":" \ -+ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -135,7 +135,7 @@ - static wchar_t progpath[MAXPATHLEN+1]; - static wchar_t *module_search_path = NULL; - static int module_search_path_malloced = 0; --static wchar_t *lib_python = L"lib/python" VERSION; -+static wchar_t *lib_python = L"@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(wchar_t *dir) -@@ -685,7 +685,7 @@ - } - else - wcsncpy(zip_path, _prefix, MAXPATHLEN); -- joinpath(zip_path, L"lib/python00.zip"); -+ joinpath(zip_path, L"@@GENTOO_LIBDIR@@/python00.zip"); - bufsz = wcslen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -695,7 +695,7 @@ - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); -- joinpath(exec_prefix, L"lib/lib-dynload"); -+ joinpath(exec_prefix, L"@@GENTOO_LIBDIR@@/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - ---- Modules/Setup.dist -+++ Modules/Setup.dist -@@ -354,7 +354,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)/@@GENTOO_LIBDIR@@ -lz - - # Interface to the Expat XML parser - # ---- setup.py -+++ setup.py -@@ -507,8 +507,7 @@ - # be assumed that no additional -I,-L directives are needed. - if not cross_compiling: - lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -+ '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] - else: -@@ -723,11 +722,11 @@ - elif curses_library: - readline_libs.append(curses_library) - 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'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: |