SOURCES: python-lib64.patch, python-noarch_to_datadir.patch, python-no_ndbm...
arekm
arekm at pld-linux.org
Fri Oct 3 10:13:54 CEST 2008
Author: arekm Date: Fri Oct 3 08:13:53 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 2.6
---- Files affected:
SOURCES:
python-lib64.patch (1.17 -> 1.18) , python-noarch_to_datadir.patch (1.9 -> 1.10) , python-no_ndbm.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/python-lib64.patch
diff -u SOURCES/python-lib64.patch:1.17 SOURCES/python-lib64.patch:1.18
--- SOURCES/python-lib64.patch:1.17 Mon Mar 19 17:11:26 2007
+++ SOURCES/python-lib64.patch Fri Oct 3 10:13:47 2008
@@ -126,28 +126,30 @@
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
+@@ -265,13 +265,20 @@
+ 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
@@ -245,15 +247,17 @@
diff -Nur Python-2.5b2.orig/Python/sysmodule.c Python-2.5b2/Python/sysmodule.c
--- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000 +0100
+++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
-@@ -1152,4 +1152,8 @@
- PyDict_SetItemString(sysdict, "platform",
- PyString_FromString(Py_GetPlatform()));
-+ PyDict_SetItemString(sysdict, "arch",
-+ PyString_FromString(Py_GetArch()));
-+ PyDict_SetItemString(sysdict, "lib",
-+ PyString_FromString(Py_GetLib()));
- PyDict_SetItemString(sysdict, "executable",
- v = PyString_FromString(Py_GetProgramFullPath()));
+@@ -1377,6 +1377,10 @@
+ PyString_FromString(Py_GetCopyright()));
+ SET_SYS_FROM_STRING("platform",
+ PyString_FromString(Py_GetPlatform()));
++ SET_SYS_FROM_STRING("arch",
++ PyString_FromString(Py_GetArch()));
++ SET_SYS_FROM_STRING("lib",
++ PyString_FromString(Py_GetLib()));
+ SET_SYS_FROM_STRING("executable",
+ PyString_FromString(Py_GetProgramFullPath()));
+ SET_SYS_FROM_STRING("prefix",
diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
--- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
+++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
================================================================
Index: SOURCES/python-noarch_to_datadir.patch
diff -u SOURCES/python-noarch_to_datadir.patch:1.9 SOURCES/python-noarch_to_datadir.patch:1.10
--- SOURCES/python-noarch_to_datadir.patch:1.9 Mon Mar 19 12:30:10 2007
+++ SOURCES/python-noarch_to_datadir.patch Fri Oct 3 10:13:48 2008
@@ -42,26 +42,24 @@
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':
+@@ -269,13 +269,10 @@
+ "python" + sys.version[:3],
+ "site-packages"))
+ 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"))
+-
++ sitedirs.append(os.path.join(prefix, "share",
++ "python" + sys.version[:3],
++ "site-packages"))
++ sitedirs.append(os.path.join(prefix, "share", "site-python"))
+ else:
+ sitedirs.append(prefix)
+ sitedirs.append(os.path.join(prefix, sys.lib, "site-packages"))
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
================================================================
Index: SOURCES/python-no_ndbm.patch
diff -u SOURCES/python-no_ndbm.patch:1.4 SOURCES/python-no_ndbm.patch:1.5
--- SOURCES/python-no_ndbm.patch:1.4 Thu Aug 28 18:27:09 2003
+++ SOURCES/python-no_ndbm.patch Fri Oct 3 10:13:48 2008
@@ -1,9 +1,10 @@
--- Python-2.3/setup.py Thu Jul 10 12:48:39 2003
+++ Python-2.3.new/setup.py Thu Aug 28 15:02:31 2003
-@@ -584,28 +584,8 @@
+@@ -1007,31 +1007,8 @@
+ missing.append('bsddb185')
# The standard Unix dbm module:
- if platform not in ['cygwin']:
+- if platform not in ['cygwin']:
- if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
@@ -26,8 +27,10 @@
- define_macros=[('HAVE_BERKDB_H',None),
- ('DB_DBM_HSEARCH',None)],
- libraries=dblibs))
-+ exts.append( Extension('dbm', ['dbmmodule.c'],
-+ libraries = ['gdbm', 'gdbm_compat'] ) )
+- else:
+- missing.append('dbm')
++ exts.append( Extension('dbm', ['dbmmodule.c'],
++ libraries = ['gdbm', 'gdbm_compat'] ) )
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-lib64.patch?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-noarch_to_datadir.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-no_ndbm.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list