SOURCES: python-noarch_to_datadir.patch - adjust for new lib64 patch
glen
glen at pld-linux.org
Thu Jan 26 01:02:53 CET 2006
Author: glen Date: Thu Jan 26 00:02:53 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adjust for new lib64 patch
---- Files affected:
SOURCES:
python-noarch_to_datadir.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/python-noarch_to_datadir.patch
diff -u SOURCES/python-noarch_to_datadir.patch:1.6 SOURCES/python-noarch_to_datadir.patch:1.7
--- SOURCES/python-noarch_to_datadir.patch:1.6 Wed Dec 1 13:41:01 2004
+++ SOURCES/python-noarch_to_datadir.patch Thu Jan 26 01:02:48 2006
@@ -1,13 +1,12 @@
-diff -dur Python-2.3.4.orig/Lib/distutils/command/install.py Python-2.3.4/Lib/distutils/command/install.py
---- Python-2.3.4.orig/Lib/distutils/command/install.py 2002-11-19 14:12:28.000000000 +0100
-+++ Python-2.3.4/Lib/distutils/command/install.py 2004-09-10 08:41:12.836021548 +0200
-@@ -38,14 +38,14 @@
+--- Python-2.4.2/Lib/distutils/command/install.py~ 2006-01-25 22:39:11.000000000 +0200
++++ Python-2.4.2/Lib/distutils/command/install.py 2006-01-25 22:42:30.000000000 +0200
+@@ -40,14 +40,14 @@
INSTALL_SCHEMES = {
'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
+ 'purelib': '$base/share/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
@@ -15,59 +14,61 @@
'unix_home': {
- 'purelib': '$base/lib/python',
+ 'purelib': '$base/share/python',
- 'platlib': '$base/lib/python',
+ 'platlib': '$base/'+libname+'/python',
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
-diff -dur Python-2.3.4.orig/Lib/distutils/sysconfig.py Python-2.3.4/Lib/distutils/sysconfig.py
---- Python-2.3.4.orig/Lib/distutils/sysconfig.py 2003-02-10 15:02:33.000000000 +0100
-+++ Python-2.3.4/Lib/distutils/sysconfig.py 2004-09-10 08:44:08.196435115 +0200
-@@ -99,8 +99,12 @@
+--- Python-2.4.2/Lib/distutils/sysconfig.py~ 2006-01-25 22:39:11.000000000 +0200
++++ Python-2.4.2/Lib/distutils/sysconfig.py 2006-01-25 22:46:07.000000000 +0200
+@@ -99,12 +99,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
-- libpython = os.path.join(prefix,
+- if plat_specific:
+- lib = sys.lib
+ if plat_specific:
+ libpython = os.path.join(prefix,
- "lib", "python" + get_python_version())
-+ else:
++ sys.lib, "python" + get_python_version())
+ else:
+- lib = 'lib'
+- libpython = os.path.join(prefix,
+- lib, "python" + get_python_version())
+ libpython = os.path.join(prefix,
+ "share", "python" + get_python_version())
if standard_lib:
return libpython
else:
-diff -dur Python-2.3.4.orig/Makefile.pre.in Python-2.3.4/Makefile.pre.in
---- Python-2.3.4.orig/Makefile.pre.in 2003-11-18 20:54:00.000000000 +0100
-+++ Python-2.3.4/Makefile.pre.in 2004-09-10 08:41:12.838021439 +0200
-@@ -83,7 +83,7 @@
+--- Python-2.4.2/Makefile.pre.in~ 2006-01-25 22:39:11.000000000 +0200
++++ Python-2.4.2/Makefile.pre.in 2006-01-25 22:47:54.000000000 +0200
+@@ -85,7 +85,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
+-SCRIPTDIR= $(prefix)/$(LIB)
+SCRIPTDIR= $(prefix)/share
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
-diff -dur Python-2.3.4.orig/Modules/getpath.c Python-2.3.4/Modules/getpath.c
---- Python-2.3.4.orig/Modules/getpath.c 2002-12-31 13:45:12.000000000 +0100
-+++ Python-2.3.4/Modules/getpath.c 2004-09-10 08:41:12.840021330 +0200
-@@ -112,7 +112,7 @@
- #endif
+--- Python-2.4.2/Modules/getpath.c~ 2006-01-25 22:39:11.000000000 +0200
++++ Python-2.4.2/Modules/getpath.c 2006-01-25 22:56:52.000000000 +0200
+@@ -121,7 +121,8 @@
#ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-+#define PYTHONPATH PREFIX "/share/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+ #define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
+- EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
++ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload:" \
++ PREFIX "/share/python" VERSION
#endif
-@@ -125,6 +125,7 @@
+ #ifndef LANDMARK
+@@ -133,6 +133,7 @@
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL;
- static char lib_python[] = "lib/python" VERSION;
+ static char lib_python[] = LIB_PYTHON;
+static char share_python[] = "share/python" VERSION;
static void
reduce(char *dir)
-@@ -256,7 +257,7 @@
+@@ -270,7 +271,7 @@
delim = strchr(prefix, DELIM);
if (delim)
*delim = '\0';
@@ -76,7 +77,7 @@
joinpath(prefix, LANDMARK);
return 1;
}
-@@ -279,7 +280,7 @@
+@@ -293,7 +294,7 @@
copy_absolute(prefix, argv0_path);
do {
n = strlen(prefix);
@@ -85,7 +86,7 @@
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -289,7 +290,7 @@
+@@ -303,7 +304,7 @@
/* Look at configure's PREFIX */
strncpy(prefix, PREFIX, MAXPATHLEN);
@@ -94,7 +95,7 @@
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -479,7 +480,7 @@
+@@ -510,7 +511,7 @@
fprintf(stderr,
"Could not find platform independent libraries <prefix>\n");
strncpy(prefix, PREFIX, MAXPATHLEN);
@@ -103,20 +104,65 @@
}
else
reduce(prefix);
---- Python-2.4a3/Lib/site.py~ 2004-09-22 10:59:13.438619336 +0000
-+++ Python-2.4a3/Lib/site.py 2004-09-22 11:01:46.976278064 +0000
-@@ -182,7 +182,13 @@
- "lib",
+--- Python-2.4.2/Lib/site.py~ 2006-01-25 22:39:11.000000000 +0200
++++ Python-2.4.2/Lib/site.py 2006-01-25 23:11:27.000000000 +0200
+@@ -182,13 +182,12 @@
+ sys.lib,
"python" + sys.version[:3],
"site-packages"),
-- os.path.join(prefix, "lib", "site-python")]
-+ os.path.join(prefix, "lib", "site-python"),
-+ os.path.join(prefix,
+- os.path.join(prefix, sys.lib, "site-python")]
+- if sys.lib != 'lib':
+- sitedirs.append(os.path.join(prefix,
+- 'lib',
+- "python" + sys.version[:3],
+- "site-packages"))
+- sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
++ os.path.join(prefix, sys.lib, "site-python"),
++ os.path.join(prefix,
+ "share",
+ "python" + sys.version[:3],
+ "site-packages"),
-+ os.path.join(prefix, "share", "site-python")]
-+
++ os.path.join(prefix, "share", "site-python")]
else:
- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
if sys.platform == 'darwin':
+--- Python-2.4.2/Modules/getpath.c~ 2006-01-26 01:43:31.000000000 +0200
++++ Python-2.4.2/Modules/getpath.c 2006-01-26 01:43:34.000000000 +0200
+@@ -113,15 +113,15 @@
+
+ #ifndef LIB_PYTHON
+ #if defined(__x86_64__)
+-#define LIB_PYTHON "lib64/python" VERSION
++#define LIB_PYTHON "lib64/python"
+ #else
+-#define LIB_PYTHON "lib/python" VERSION
++#define LIB_PYTHON "lib/python"
+ #endif
+ #endif
+
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
+- EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload:" \
++#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
++ EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" \
+ PREFIX "/share/python" VERSION
+ #endif
+
+@@ -133,7 +133,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = LIB_PYTHON;
++static char lib_python[] = LIB_PYTHON VERSION;
+ static char share_python[] = "share/python" VERSION;
+
+ static void
+@@ -525,7 +525,7 @@
+ }
+ else
+ strncpy(zip_path, PREFIX, MAXPATHLEN);
+- joinpath(zip_path, "lib/python00.zip");
++ joinpath(zip_path, LIB_PYTHON "00.zip");
+ bufsz = strlen(zip_path); /* Replace "00" with version */
+ zip_path[bufsz - 6] = VERSION[0];
+ zip_path[bufsz - 5] = VERSION[2];
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/python-noarch_to_datadir.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list