bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update python to 2.6.1.

Browse Source 
Get rid of the virtual python-core package and instead python depends on
python-mini and provides files missing in python-mini for a full featured python
installation.
Thus also update the dependencies of various python packages.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@14760 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars
2009-03-06 20:27:09 +00:00
parent 519f8c7053
commit a456db34e4
42 changed files with 425 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lang/python/patches/080-distutils-dont_adjust_files.patch
View File

@ -1,7 +1,8 @@
diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/Lib/distutils/command/build_scripts.py
--- Python-2.5.4.orig/Lib/distutils/command/build_scripts.py 2009-01-11 06:17:43.000000000 +0100
+++ Python-2.5.4/Lib/distutils/command/build_scripts.py 2009-01-11 15:01:54.000000000 +0100
@@ -54,15 +54,10 @@
diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
index c0d8f70..d36e29c 100644
--- a/Lib/distutils/command/build_scripts.py
+++ b/Lib/distutils/command/build_scripts.py
@@ -51,10 +51,7 @@ class build_scripts (Command):
def copy_scripts (self):
@ -9,19 +10,20 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/
- Python script in the Unix way (first line matches 'first_line_re',
- ie. starts with "\#!" and contains "python"), then adjust the first
- line to refer to the current Python interpreter as we copy.
- """
+ """Copy each script listed in 'self.scripts'"""
+ """Copy each script listed in 'self.scripts';
"""
self.mkpath(self.build_dir)
outfiles = []
for script in self.scripts:
- adjust = 0
script = convert_path(script)
outfile = os.path.join(self.build_dir, os.path.basename(script))
outfiles.append(outfile)
@@ -86,34 +81,12 @@
self.warn("%s is an empty file (skipping)" % script)
continue
@@ -77,41 +74,9 @@ class build_scripts (Command):
if not self.dry_run:
raise
f = None
- else:
- first_line = f.readline()
- if not first_line:
- self.warn("%s is an empty file (skipping)" % script)
- continue
-
- match = first_line_re.match(first_line)
- if match:
- adjust = 1
@ -40,7 +42,8 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/
- outf.write("#!%s%s\n" %
- (os.path.join(
- sysconfig.get_config_var("BINDIR"),
- "python" + sysconfig.get_config_var("EXE")),
- "python" + sysconfig.get_config_var("VERSION")
- + sysconfig.get_config_var("EXE")),
- post_interp))
- outf.writelines(f.readlines())
- outf.close()
@ -52,9 +55,6 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/
- self.copy_file(script, outfile)
+ if f:
+ f.close()
+
+ log.info("copying %s -> %s", script,
+ self.build_dir)
+ self.copy_file(script, outfile)
if os.name == 'posix':