SOURCES: python-noarch_to_datadir.patch - simplify
tommat
tommat at pld-linux.org
Sat Mar 17 17:39:41 CET 2007
Author: tommat Date: Sat Mar 17 16:39:41 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- simplify
---- Files affected:
SOURCES:
python-noarch_to_datadir.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/python-noarch_to_datadir.patch
diff -u SOURCES/python-noarch_to_datadir.patch:1.7 SOURCES/python-noarch_to_datadir.patch:1.8
--- SOURCES/python-noarch_to_datadir.patch:1.7 Thu Jan 26 01:02:48 2006
+++ SOURCES/python-noarch_to_datadir.patch Sat Mar 17 17:39:35 2007
@@ -1,5 +1,6 @@
---- 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
+diff -Nur Python-2.5.orig/Lib/distutils/command/install.py Python-2.5/Lib/distutils/command/install.py
+--- Python-2.5.orig/Lib/distutils/command/install.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/distutils/command/install.py 2007-03-17 16:26:50.821671250 +0000
@@ -40,14 +40,14 @@
INSTALL_SCHEMES = {
@@ -17,8 +18,9 @@
'platlib': '$base/'+libname+'/python',
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
---- 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
+diff -Nur Python-2.5.orig/Lib/distutils/sysconfig.py Python-2.5/Lib/distutils/sysconfig.py
+--- Python-2.5.orig/Lib/distutils/sysconfig.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/distutils/sysconfig.py 2007-03-17 16:26:50.821671250 +0000
@@ -99,12 +99,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -37,9 +39,33 @@
if standard_lib:
return libpython
else:
---- 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 @@
+diff -Nur Python-2.5.orig/Lib/site.py Python-2.5/Lib/site.py
+--- Python-2.5.orig/Lib/site.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/site.py 2007-03-17 16:26:50.825671500 +0000
+@@ -185,13 +185,12 @@
+ sys.lib,
+ "python" + sys.version[:3],
+ "site-packages"),
+- 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")]
+ else:
+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
+ if sys.platform == 'darwin':
+diff -Nur Python-2.5.orig/Makefile.pre.in Python-2.5/Makefile.pre.in
+--- Python-2.5.orig/Makefile.pre.in 2007-03-17 16:26:13.807358000 +0000
++++ Python-2.5/Makefile.pre.in 2007-03-17 16:26:50.821671250 +0000
+@@ -90,7 +90,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@@ -48,27 +74,41 @@
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
---- 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 @@
+diff -Nur Python-2.5.orig/Modules/getpath.c Python-2.5/Modules/getpath.c
+--- Python-2.5.orig/Modules/getpath.c 2007-03-17 16:26:13.807358000 +0000
++++ Python-2.5/Modules/getpath.c 2007-03-17 16:26:50.825671500 +0000
+@@ -118,15 +118,16 @@
+
+ #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 ":" \
+-#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
- EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
-+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload:" \
++#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
++ EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" \
+ PREFIX "/share/python" VERSION
#endif
#ifndef LANDMARK
-@@ -133,6 +133,7 @@
+@@ -137,7 +138,8 @@
+ 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;
++static char lib_python[] = LIB_PYTHON VERSION;
+static char share_python[] = "share/python" VERSION;
static void
reduce(char *dir)
-@@ -270,7 +271,7 @@
+@@ -275,7 +277,7 @@
delim = strchr(prefix, DELIM);
if (delim)
*delim = '\0';
@@ -77,7 +117,7 @@
joinpath(prefix, LANDMARK);
return 1;
}
-@@ -293,7 +294,7 @@
+@@ -298,7 +300,7 @@
copy_absolute(prefix, argv0_path);
do {
n = strlen(prefix);
@@ -86,7 +126,7 @@
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -303,7 +304,7 @@
+@@ -308,7 +310,7 @@
/* Look at configure's PREFIX */
strncpy(prefix, PREFIX, MAXPATHLEN);
@@ -95,7 +135,7 @@
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -510,7 +511,7 @@
+@@ -519,7 +521,7 @@
fprintf(stderr,
"Could not find platform independent libraries <prefix>\n");
strncpy(prefix, PREFIX, MAXPATHLEN);
@@ -104,60 +144,7 @@
}
else
reduce(prefix);
---- 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, 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")]
- else:
- 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 @@
+@@ -532,7 +534,7 @@
}
else
strncpy(zip_path, PREFIX, MAXPATHLEN);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/python-noarch_to_datadir.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list