SOURCES: python30-lib64.patch - updated for version 3.0
cieciwa
cieciwa at pld-linux.org
Fri Jan 23 15:13:29 CET 2009
Author: cieciwa Date: Fri Jan 23 14:13:29 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for version 3.0
---- Files affected:
SOURCES:
python30-lib64.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/python30-lib64.patch
diff -u SOURCES/python30-lib64.patch:1.1 SOURCES/python30-lib64.patch:1.2
--- SOURCES/python30-lib64.patch:1.1 Sun Sep 2 20:37:47 2007
+++ SOURCES/python30-lib64.patch Fri Jan 23 15:13:23 2009
@@ -126,28 +126,29 @@
diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
--- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
+++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
-@@ -182,12 +182,18 @@
- sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
- elif os.sep == '/':
- sitedirs = [os.path.join(prefix,
-- "lib",
-+ sys.lib,
- "python" + sys.version[:3],
- "site-packages"),
-- os.path.join(prefix, "lib", "site-python")]
-+ 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"))
- else:
-- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
-+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
- if sys.platform == 'darwin':
- # for framework builds *only* we add the standard Apple
- # locations. Currently only per-user, but /Library and
+@@ -258,13 +258,19 @@
+ if sys.platform in ('os2emx', 'riscos'):
+ sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+ elif os.sep == '/':
+- sitedirs.append(os.path.join(prefix, "lib",
++ sitedirs.append(os.path.join(prefix, sys.lib,
+ "python" + sys.version[:3],
+ "site-packages"))
+- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
++ sitedirs.append(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"))
++
+ else:
+ sitedirs.append(prefix)
+- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
++ sitedirs.append(os.path.join(prefix, sys.lib, "site-packages"))
+
+ if sys.platform == "darwin":
+ # for framework builds *only* we add the standard Apple
diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
--- Python-2.5b2.orig/Makefile.pre.in 2006-06-27 16:45:32.000000000 +0100
+++ Python-2.5b2/Makefile.pre.in 2006-07-12 17:42:51.000000000 +0100
@@ -206,15 +207,15 @@
#endif
#ifndef LANDMARK
-@@ -129,7 +137,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[] = LIB_PYTHON VERSION;
+@@ -137,7 +137,7 @@
+ static wchar_t exec_prefix[MAXPATHLEN+1];
+ static wchar_t progpath[MAXPATHLEN+1];
+ static wchar_t *module_search_path = NULL;
+-static wchar_t lib_python[] = L"lib/python" VERSION;
++static wchar_t lib_python[] = LIB_PYTHON VERSION;
- static void
- reduce(char *dir)
+ /* In principle, this should use HAVE__WSTAT, and _wstat
+ should be detected by autoconf. However, no current
diff -Nur Python-2.5b2.orig/Python/getplatform.c Python-2.5b2/Python/getplatform.c
--- Python-2.5b2.orig/Python/getplatform.c 2000-09-02 00:29:29.000000000 +0100
+++ Python-2.5b2/Python/getplatform.c 2006-07-12 17:42:51.000000000 +0100
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python30-lib64.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list