summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/python/python-2.5.2/autohell.patch50
-rw-r--r--meta/packages/python/python-2.5.2/bindir-libdir.patch20
-rw-r--r--meta/packages/python/python-2.5.2/crosscompile.patch110
-rw-r--r--meta/packages/python/python-2.5.2/default-is-optimized.patch13
-rw-r--r--meta/packages/python/python-2.5.2/enable-ctypes-module.patch106
-rw-r--r--meta/packages/python/python-2.5.2/fix-tkinter-detection.patch41
-rw-r--r--meta/packages/python/python-2.5.2/sitebranding.patch21
-rw-r--r--meta/packages/python/python-2.5.2/sitecustomize.py44
-rw-r--r--meta/packages/python/python-2.6.1/02-remove-test-for-cross.patch94
-rw-r--r--meta/packages/python/python-2.6.1/07-export-grammer.patch10
-rw-r--r--meta/packages/python/python-2.6.2/01-use-proper-tools-for-cross-build.patch116
-rw-r--r--meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch40
-rw-r--r--meta/packages/python/python-2.6.2/04-default-is-optimized.patch52
-rw-r--r--meta/packages/python/python-2.6.2/05-enable-ctypes-cross-build.patch28
-rw-r--r--meta/packages/python/python-2.6.2/99-ignore-optimization-flag.patch19
-rw-r--r--meta/packages/python/python-native-2.5.1/bindir-libdir.patch18
-rw-r--r--meta/packages/python/python-native-2.5.1/catchup-with-swig.patch13
-rw-r--r--meta/packages/python/python-native-2.5.1/cross-distutils.patch36
-rw-r--r--meta/packages/python/python-native-2.5.1/default-is-optimized.patch13
-rw-r--r--meta/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch16
-rw-r--r--meta/packages/python/python-native-2.5.1/enable-ctypes-module.patch106
-rw-r--r--meta/packages/python/python-native-2.5.1/fix-staging.patch38
-rw-r--r--meta/packages/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch20
-rw-r--r--meta/packages/python/python-native-2.6.1/sitecustomize.py45
-rw-r--r--meta/packages/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch (renamed from meta/packages/python/python-2.6.1/00-fix-bindir-libdir-for-cross.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/04-default-is-optimized.patch (renamed from meta/packages/python/python-native-2.6.1/04-default-is-optimized.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch (renamed from meta/packages/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch (renamed from meta/packages/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch (renamed from meta/packages/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/debug.patch (renamed from meta/packages/python/python-native-2.6.1/debug.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/nohostlibs.patch (renamed from meta/packages/python/python-native-2.6.1/nohostlibs.patch)0
-rw-r--r--meta/packages/python/python-native-2.6.5/sitecustomize.py (renamed from meta/packages/python/python-2.6.1/sitecustomize.py)0
-rw-r--r--meta/packages/python/python-native_2.6.1.bb33
-rw-r--r--meta/packages/python/python-native_2.6.5.bb31
-rw-r--r--meta/packages/python/python/00-fix-bindir-libdir-for-cross.patch (renamed from meta/packages/python/python-2.6.2/00-fix-bindir-libdir-for-cross.patch)0
-rw-r--r--meta/packages/python/python/01-use-proper-tools-for-cross-build.patch (renamed from meta/packages/python/python-2.6.1/01-use-proper-tools-for-cross-build.patch)0
-rw-r--r--meta/packages/python/python/02-remove-test-for-cross.patch (renamed from meta/packages/python/python-2.6.2/02-remove-test-for-cross.patch)44
-rw-r--r--meta/packages/python/python/03-fix-tkinter-detection.patch (renamed from meta/packages/python/python-2.6.1/03-fix-tkinter-detection.patch)0
-rw-r--r--meta/packages/python/python/04-default-is-optimized.patch (renamed from meta/packages/python/python-2.6.1/04-default-is-optimized.patch)0
-rw-r--r--meta/packages/python/python/05-enable-ctypes-cross-build.patch (renamed from meta/packages/python/python-2.6.1/05-enable-ctypes-cross-build.patch)0
-rw-r--r--meta/packages/python/python/99-ignore-optimization-flag.patch (renamed from meta/packages/python/python-2.6.1/99-ignore-optimization-flag.patch)0
-rw-r--r--meta/packages/python/python/sitecustomize.py (renamed from meta/packages/python/python-2.6.2/sitecustomize.py)0
-rw-r--r--meta/packages/python/python_2.6.1.bb113
-rw-r--r--meta/packages/python/python_2.6.5.bb (renamed from meta/packages/python/python_2.6.2.bb)23
44 files changed, 66 insertions, 1247 deletions
diff --git a/meta/packages/python/python-2.5.2/autohell.patch b/meta/packages/python/python-2.5.2/autohell.patch
deleted file mode 100644
index 32977955d4..0000000000
--- a/meta/packages/python/python-2.5.2/autohell.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1Index: Python-2.5.2/configure.in
2===================================================================
3--- Python-2.5.2.orig/configure.in
4+++ Python-2.5.2/configure.in
5@@ -3410,45 +3410,6 @@ esac
6
7
8
9-AC_MSG_CHECKING(for %zd printf() format support)
10-AC_TRY_RUN([#include <stdio.h>
11-#include <stddef.h>
12-#include <string.h>
13-
14-#ifdef HAVE_SYS_TYPES_H
15-#include <sys/types.h>
16-#endif
17-
18-#ifdef HAVE_SSIZE_T
19-typedef ssize_t Py_ssize_t;
20-#elif SIZEOF_VOID_P == SIZEOF_LONG
21-typedef long Py_ssize_t;
22-#else
23-typedef int Py_ssize_t;
24-#endif
25-
26-int main()
27-{
28- char buffer[256];
29-
30- if(sprintf(buffer, "%zd", (size_t)123) < 0)
31- return 1;
32-
33- if (strcmp(buffer, "123"))
34- return 1;
35-
36- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
37- return 1;
38-
39- if (strcmp(buffer, "-123"))
40- return 1;
41-
42- return 0;
43-}],
44-[AC_MSG_RESULT(yes)
45- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
46- AC_MSG_RESULT(no))
47-
48 AC_CHECK_TYPE(socklen_t,,
49 AC_DEFINE(socklen_t,int,
50 Define to `int' if <sys/socket.h> does not define.),[
diff --git a/meta/packages/python/python-2.5.2/bindir-libdir.patch b/meta/packages/python/python-2.5.2/bindir-libdir.patch
deleted file mode 100644
index 047c358a55..0000000000
--- a/meta/packages/python/python-2.5.2/bindir-libdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6Index: Python-2.5.1/Makefile.pre.in
7===================================================================
8--- Python-2.5.1.orig/Makefile.pre.in
9+++ Python-2.5.1/Makefile.pre.in
10@@ -83,8 +83,8 @@ prefix= @prefix@
11 exec_prefix= @exec_prefix@
12
13 # Expanded directories
14-BINDIR= $(exec_prefix)/bin
15-LIBDIR= $(exec_prefix)/lib
16+BINDIR= @bindir@
17+LIBDIR= @libdir@
18 MANDIR= @mandir@
19 INCLUDEDIR= @includedir@
20 CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta/packages/python/python-2.5.2/crosscompile.patch b/meta/packages/python/python-2.5.2/crosscompile.patch
deleted file mode 100644
index f1b1c6f3e0..0000000000
--- a/meta/packages/python/python-2.5.2/crosscompile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1#
2# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de>
3#
4Index: Python-2.5.2/Makefile.pre.in
5===================================================================
6--- Python-2.5.2.orig/Makefile.pre.in
7+++ Python-2.5.2/Makefile.pre.in
8@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
9
10 PYTHON= python$(EXE)
11 BUILDPYTHON= python$(BUILDEXE)
12+HOSTPYTHON= $(BUILDPYTHON)
13
14 # === Definitions added by makesetup ===
15
16@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
17 ##########################################################################
18 # Parser
19 PGEN= Parser/pgen$(EXE)
20-
21+HOSTPGEN= $(PGEN)$(EXE)
22 POBJS= \
23 Parser/acceler.o \
24 Parser/grammar1.o \
25@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON)
26 # Build the shared modules
27 sharedmods: $(BUILDPYTHON)
28 case $$MAKEFLAGS in \
29- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
30- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
31+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
32+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
33 esac
34
35 # Build static library
36@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
37
38 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
39 -@ mkdir Include
40- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
41+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
42
43 $(PGEN): $(PGENOBJS)
44 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
45@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib
46 done
47 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
48 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
49- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
50+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
51 -d $(LIBDEST) -f \
52 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
53 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
54- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
55+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
56 -d $(LIBDEST) -f \
57 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
58 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
59- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
60+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
61 -d $(LIBDEST)/site-packages -f \
62 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
63 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
64- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
65+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
66 -d $(LIBDEST)/site-packages -f \
67 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
68
69@@ -894,7 +895,7 @@ libainstall: all
70 # Install the dynamically loadable modules
71 # This goes into $(exec_prefix)
72 sharedinstall:
73- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
74+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
75 --prefix=$(prefix) \
76 --install-scripts=$(BINDIR) \
77 --install-platlib=$(DESTSHARED) \
78Index: Python-2.5.2/setup.py
79===================================================================
80--- Python-2.5.2.orig/setup.py
81+++ Python-2.5.2/setup.py
82@@ -211,6 +211,7 @@ class PyBuildExt(build_ext):
83 except ImportError, why:
84 self.announce('*** WARNING: renaming "%s" since importing it'
85 ' failed: %s' % (ext.name, why), level=3)
86+ return
87 assert not self.inplace
88 basename, tail = os.path.splitext(ext_filename)
89 newname = basename + "_failed" + tail
90@@ -244,8 +245,8 @@ class PyBuildExt(build_ext):
91
92 def detect_modules(self):
93 # Ensure that /usr/local is always used
94- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
95- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
96+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
97+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
98
99 # Add paths specified in the environment variables LDFLAGS and
100 # CPPFLAGS for header and library files.
101@@ -342,6 +343,9 @@ class PyBuildExt(build_ext):
102
103 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
104
105+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
106+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
107+
108 #
109 # The following modules are all pretty straightforward, and compile
110 # on pretty much any POSIXish platform.
diff --git a/meta/packages/python/python-2.5.2/default-is-optimized.patch b/meta/packages/python/python-2.5.2/default-is-optimized.patch
deleted file mode 100644
index 6beeb6e022..0000000000
--- a/meta/packages/python/python-2.5.2/default-is-optimized.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: Python-2.5.1/Python/compile.c
2===================================================================
3--- Python-2.5.1.orig/Python/compile.c
4+++ Python-2.5.1/Python/compile.c
5@@ -30,7 +30,7 @@
6 #include "symtable.h"
7 #include "opcode.h"
8
9-int Py_OptimizeFlag = 0;
10+int Py_OptimizeFlag = 1;
11
12 /*
13 ISSUES:
diff --git a/meta/packages/python/python-2.5.2/enable-ctypes-module.patch b/meta/packages/python/python-2.5.2/enable-ctypes-module.patch
deleted file mode 100644
index dd5adaf0e7..0000000000
--- a/meta/packages/python/python-2.5.2/enable-ctypes-module.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
2--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200
3+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100
4@@ -1321,16 +1329,16 @@
5 ffi_configfile):
6 from distutils.dir_util import mkpath
7 mkpath(ffi_builddir)
8- config_args = []
9+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
10
11 # Pass empty CFLAGS because we'll just append the resulting
12 # CFLAGS to Python's; -g or -O2 is to be avoided.
13- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
14- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
15+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
16+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
17
18 res = os.system(cmd)
19 if res or not os.path.exists(ffi_configfile):
20- print "Failed to configure _ctypes module"
21+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
22 return False
23
24 fficonfig = {}
25diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
26--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200
27+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100
28@@ -273,11 +273,13 @@
29 PyErr_NoMemory();
30 return NULL;
31 }
32+#if FFI_CLOSURES
33 p->pcl = MallocClosure();
34 if (p->pcl == NULL) {
35 PyErr_NoMemory();
36 goto error;
37 }
38+#endif
39
40 for (i = 0; i < nArgs; ++i) {
41 PyObject *cnv = PySequence_GetItem(converters, i);
42@@ -315,12 +317,14 @@
43 "ffi_prep_cif failed with %d", result);
44 goto error;
45 }
46+#if FFI_CLOSURES
47 result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
48 if (result != FFI_OK) {
49 PyErr_Format(PyExc_RuntimeError,
50 "ffi_prep_closure failed with %d", result);
51 goto error;
52 }
53+#endif
54
55 p->converters = converters;
56 p->callable = callable;
57@@ -328,8 +332,10 @@
58
59 error:
60 if (p) {
61+#if FFI_CLOSURES
62 if (p->pcl)
63 FreeClosure(p->pcl);
64+#endif
65 PyMem_Free(p);
66 }
67 return NULL;
68diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
69--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100
70+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100
71@@ -3419,7 +3419,9 @@
72 Py_CLEAR(self->paramflags);
73
74 if (self->thunk) {
75+#if FFI_CLOSURES
76 FreeClosure(self->thunk->pcl);
77+#endif
78 PyMem_Free(self->thunk);
79 self->thunk = NULL;
80 }
81diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
82--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200
83+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100
84@@ -68,7 +68,9 @@
85 };
86
87 typedef struct {
88+#if FFI_CLOSURES
89 ffi_closure *pcl; /* the C callable */
90+#endif
91 ffi_cif cif;
92 PyObject *converters;
93 PyObject *callable;
94diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
95--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200
96+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100
97@@ -27,7 +27,9 @@
98 /******************************************************************/
99
100 typedef union _tagITEM {
101+#if FFI_CLOSURES
102 ffi_closure closure;
103+#endif
104 union _tagITEM *next;
105 } ITEM;
106
diff --git a/meta/packages/python/python-2.5.2/fix-tkinter-detection.patch b/meta/packages/python/python-2.5.2/fix-tkinter-detection.patch
deleted file mode 100644
index 93bd343381..0000000000
--- a/meta/packages/python/python-2.5.2/fix-tkinter-detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6Index: Python-2.5.1/setup.py
7===================================================================
8--- Python-2.5.1.orig/setup.py
9+++ Python-2.5.1/setup.py
10@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext):
11 dotversion = dotversion[:-1] + '.' + dotversion[-1]
12 tcl_include_sub = []
13 tk_include_sub = []
14- for dir in inc_dirs:
15+ for dir in [os.getenv("STAGING_INCDIR")]:
16 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
17 tk_include_sub += [dir + os.sep + "tk" + dotversion]
18 tk_include_sub += tcl_include_sub
19@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext):
20 if dir not in include_dirs:
21 include_dirs.append(dir)
22
23- # Check for various platform-specific directories
24- if platform == 'sunos5':
25- include_dirs.append('/usr/openwin/include')
26- added_lib_dirs.append('/usr/openwin/lib')
27- elif os.path.exists('/usr/X11R6/include'):
28- include_dirs.append('/usr/X11R6/include')
29- added_lib_dirs.append('/usr/X11R6/lib64')
30- added_lib_dirs.append('/usr/X11R6/lib')
31- elif os.path.exists('/usr/X11R5/include'):
32- include_dirs.append('/usr/X11R5/include')
33- added_lib_dirs.append('/usr/X11R5/lib')
34- else:
35- # Assume default location for X11
36- include_dirs.append('/usr/X11/include')
37- added_lib_dirs.append('/usr/X11/lib')
38-
39 # If Cygwin, then verify that X is installed before proceeding
40 if platform == 'cygwin':
41 x11_inc = find_file('X11/Xlib.h', [], include_dirs)
diff --git a/meta/packages/python/python-2.5.2/sitebranding.patch b/meta/packages/python/python-2.5.2/sitebranding.patch
deleted file mode 100644
index c6e486ae97..0000000000
--- a/meta/packages/python/python-2.5.2/sitebranding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6Index: Python-2.5.1/Lib/site.py
7===================================================================
8--- Python-2.5.1.orig/Lib/site.py
9+++ Python-2.5.1/Lib/site.py
10@@ -323,8 +323,9 @@ def setcopyright():
11 "Jython is maintained by the Jython developers (www.jython.org).")
12 else:
13 __builtin__.credits = _Printer("credits", """\
14- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
15- for supporting Python development. See www.python.org for more information.""")
16+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org).
17+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by
18+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""")
19 here = os.path.dirname(os.__file__)
20 __builtin__.license = _Printer(
21 "license", "See http://www.python.org/%.3s/license.html" % sys.version,
diff --git a/meta/packages/python/python-2.5.2/sitecustomize.py b/meta/packages/python/python-2.5.2/sitecustomize.py
deleted file mode 100644
index ec626b4b63..0000000000
--- a/meta/packages/python/python-2.5.2/sitecustomize.py
+++ /dev/null
@@ -1,44 +0,0 @@
1# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
2# GPLv2 or later
3# Version: 20082201
4# Features:
5# * set proper default encoding
6# * enable readline completion in the interactive interpreter
7# * load command line history on startup
8# * save command line history on exit
9
10import os
11
12def __exithandler():
13 try:
14 readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
15 except IOError:
16 pass
17
18def __registerExitHandler():
19 import atexit
20 atexit.register( __exithandler )
21
22def __enableReadlineSupport():
23 readline.parse_and_bind("tab: complete")
24 try:
25 readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
26 except IOError:
27 pass
28
29def __enableDefaultEncoding():
30 import sys
31 try:
32 sys.setdefaultencoding('utf8')
33 except LookupError:
34 pass
35
36import sys
37try:
38 import rlcompleter, readline
39except ImportError:
40 pass
41else:
42 __enableDefaultEncoding()
43 __registerExitHandler()
44 __enableReadlineSupport()
diff --git a/meta/packages/python/python-2.6.1/02-remove-test-for-cross.patch b/meta/packages/python/python-2.6.1/02-remove-test-for-cross.patch
deleted file mode 100644
index 48386ea462..0000000000
--- a/meta/packages/python/python-2.6.1/02-remove-test-for-cross.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1# OpenEmbedded prepopulates the autotools site cache, so if this
2# would be using AC_TRY_CACHE, we could patch it in a more sane way
3# Alas, I don't have enough autotalent to do that.
4#
5# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
6Index: Python-2.6.1/configure.in
7===================================================================
8--- Python-2.6.1.orig/configure.in
9+++ Python-2.6.1/configure.in
10@@ -2556,38 +2556,6 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_
11 AC_CHECK_LIB(resolv, inet_aton)
12 )
13
14-# On Tru64, chflags seems to be present, but calling it will
15-# exit Python
16-AC_MSG_CHECKING(for chflags)
17-AC_TRY_RUN([
18-#include <sys/stat.h>
19-#include <unistd.h>
20-int main(int argc, char*argv[])
21-{
22- if(chflags(argv[0], 0) != 0)
23- return 1;
24- return 0;
25-}
26-],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
27- AC_MSG_RESULT(yes),
28- AC_MSG_RESULT(no)
29-)
30-
31-AC_MSG_CHECKING(for lchflags)
32-AC_TRY_RUN([
33-#include <sys/stat.h>
34-#include <unistd.h>
35-int main(int argc, char*argv[])
36-{
37- if(lchflags(argv[0], 0) != 0)
38- return 1;
39- return 0;
40-}
41-],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
42- AC_MSG_RESULT(yes),
43- AC_MSG_RESULT(no)
44-)
45-
46 dnl Check if system zlib has *Copy() functions
47 dnl
48 dnl On MacOSX the linker will search for dylibs on the entire linker path
49@@ -3649,45 +3617,6 @@ else
50 AC_MSG_RESULT(no)
51 fi
52
53-AC_MSG_CHECKING(for %zd printf() format support)
54-AC_TRY_RUN([#include <stdio.h>
55-#include <stddef.h>
56-#include <string.h>
57-
58-#ifdef HAVE_SYS_TYPES_H
59-#include <sys/types.h>
60-#endif
61-
62-#ifdef HAVE_SSIZE_T
63-typedef ssize_t Py_ssize_t;
64-#elif SIZEOF_VOID_P == SIZEOF_LONG
65-typedef long Py_ssize_t;
66-#else
67-typedef int Py_ssize_t;
68-#endif
69-
70-int main()
71-{
72- char buffer[256];
73-
74- if(sprintf(buffer, "%zd", (size_t)123) < 0)
75- return 1;
76-
77- if (strcmp(buffer, "123"))
78- return 1;
79-
80- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
81- return 1;
82-
83- if (strcmp(buffer, "-123"))
84- return 1;
85-
86- return 0;
87-}],
88-[AC_MSG_RESULT(yes)
89- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
90- AC_MSG_RESULT(no))
91-
92 AC_CHECK_TYPE(socklen_t,,
93 AC_DEFINE(socklen_t,int,
94 Define to `int' if <sys/socket.h> does not define.),[
diff --git a/meta/packages/python/python-2.6.1/07-export-grammer.patch b/meta/packages/python/python-2.6.1/07-export-grammer.patch
deleted file mode 100644
index b7ec2bbc65..0000000000
--- a/meta/packages/python/python-2.6.1/07-export-grammer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- Python-2.6.1.orig/Parser/printgrammar.c 2008-04-13 15:35:56.000000000 -0500
2+++ Python-2.6.1/Parser/printgrammar.c 2008-12-28 00:01:28.675633800 -0600
3@@ -16,6 +16,7 @@
4 fprintf(fp, "/* Generated by Parser/pgen */\n\n");
5 fprintf(fp, "#include \"pgenheaders.h\"\n");
6 fprintf(fp, "#include \"grammar.h\"\n");
7+ fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n");
8 printdfas(g, fp);
9 printlabels(g, fp);
10 fprintf(fp, "grammar _PyParser_Grammar = {\n");
diff --git a/meta/packages/python/python-2.6.2/01-use-proper-tools-for-cross-build.patch b/meta/packages/python/python-2.6.2/01-use-proper-tools-for-cross-build.patch
deleted file mode 100644
index e89faa4fb0..0000000000
--- a/meta/packages/python/python-2.6.2/01-use-proper-tools-for-cross-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
1# We need to ensure our host tools get run during build, not the freshly
2# built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN.
3# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
4
5Index: Python-2.6.1/Makefile.pre.in
6===================================================================
7--- Python-2.6.1.orig/Makefile.pre.in
8+++ Python-2.6.1/Makefile.pre.in
9@@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
10
11 PYTHON= python$(EXE)
12 BUILDPYTHON= python$(BUILDEXE)
13+HOSTPYTHON= $(BUILDPYTHON)
14
15 # The task to run while instrument when building the profile-opt target
16 PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
17@@ -205,7 +206,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
18 ##########################################################################
19 # Parser
20 PGEN= Parser/pgen$(EXE)
21-
22+HOSTPGEN= $(PGEN)$(EXE)
23 POBJS= \
24 Parser/acceler.o \
25 Parser/grammar1.o \
26@@ -394,8 +395,8 @@ platform: $(BUILDPYTHON)
27 # Build the shared modules
28 sharedmods: $(BUILDPYTHON)
29 @case $$MAKEFLAGS in \
30- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
31- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
32+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
33+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
34 esac
35
36 # Build static library
37@@ -513,7 +514,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
38
39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
40 -@$(INSTALL) -d Include
41- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
42+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
43
44 $(PGEN): $(PGENOBJS)
45 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
46@@ -879,23 +880,23 @@ libinstall: build_all $(srcdir)/Lib/$(PL
47 done
48 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
49 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
50- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
51+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
52 -d $(LIBDEST) -f \
53 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
54 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
55- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
56+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
57 -d $(LIBDEST) -f \
58 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
59 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
60- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
61+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
62 -d $(LIBDEST)/site-packages -f \
63 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
64 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
65- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
66+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
67 -d $(LIBDEST)/site-packages -f \
68 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
69 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
70- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
71+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
72
73 # Create the PLATDIR source directory, if one wasn't distributed..
74 $(srcdir)/Lib/$(PLATDIR):
75@@ -993,7 +994,7 @@ libainstall: all
76 # Install the dynamically loadable modules
77 # This goes into $(exec_prefix)
78 sharedinstall:
79- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
80+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
81 --prefix=$(prefix) \
82 --install-scripts=$(BINDIR) \
83 --install-platlib=$(DESTSHARED) \
84Index: Python-2.6.1/setup.py
85===================================================================
86--- Python-2.6.1.orig/setup.py
87+++ Python-2.6.1/setup.py
88@@ -276,6 +276,7 @@ class PyBuildExt(build_ext):
89 self.failed.append(ext.name)
90 self.announce('*** WARNING: renaming "%s" since importing it'
91 ' failed: %s' % (ext.name, why), level=3)
92+ return
93 assert not self.inplace
94 basename, tail = os.path.splitext(ext_filename)
95 newname = basename + "_failed" + tail
96@@ -310,8 +311,8 @@ class PyBuildExt(build_ext):
97
98 def detect_modules(self):
99 # Ensure that /usr/local is always used
100- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
101- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
102+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
103+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
104
105 # Add paths specified in the environment variables LDFLAGS and
106 # CPPFLAGS for header and library files.
107@@ -410,6 +411,9 @@ class PyBuildExt(build_ext):
108
109 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
110
111+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
112+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
113+
114 #
115 # The following modules are all pretty straightforward, and compile
116 # on pretty much any POSIXish platform.
diff --git a/meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch b/meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch
deleted file mode 100644
index a1a385a07c..0000000000
--- a/meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1# We need to supply STAGING_INCDIR here, otherwise the Tk headers
2# will not be found.
3# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de>
4
5Index: Python-2.6.1/setup.py
6===================================================================
7--- Python-2.6.1.orig/setup.py
8+++ Python-2.6.1/setup.py
9@@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext):
10 dotversion = dotversion[:-1] + '.' + dotversion[-1]
11 tcl_include_sub = []
12 tk_include_sub = []
13- for dir in inc_dirs:
14+ for dir in [os.getenv("STAGING_INCDIR")]:
15 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
16 tk_include_sub += [dir + os.sep + "tk" + dotversion]
17 tk_include_sub += tcl_include_sub
18@@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext):
19 if dir not in include_dirs:
20 include_dirs.append(dir)
21
22- # Check for various platform-specific directories
23- if platform == 'sunos5':
24- include_dirs.append('/usr/openwin/include')
25- added_lib_dirs.append('/usr/openwin/lib')
26- elif os.path.exists('/usr/X11R6/include'):
27- include_dirs.append('/usr/X11R6/include')
28- added_lib_dirs.append('/usr/X11R6/lib64')
29- added_lib_dirs.append('/usr/X11R6/lib')
30- elif os.path.exists('/usr/X11R5/include'):
31- include_dirs.append('/usr/X11R5/include')
32- added_lib_dirs.append('/usr/X11R5/lib')
33- else:
34- # Assume default location for X11
35- include_dirs.append('/usr/X11/include')
36- added_lib_dirs.append('/usr/X11/lib')
37-
38 # If Cygwin, then verify that X is installed before proceeding
39 if platform == 'cygwin':
40 x11_inc = find_file('X11/Xlib.h', [], include_dirs)
diff --git a/meta/packages/python/python-2.6.2/04-default-is-optimized.patch b/meta/packages/python/python-2.6.2/04-default-is-optimized.patch
deleted file mode 100644
index 805f4f696c..0000000000
--- a/meta/packages/python/python-2.6.2/04-default-is-optimized.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1# when compiling for an embedded system, we need every bit of
2# performance we can get. default to optimized with the option
3# of opt-out.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5
6Index: Python-2.6.1/Python/compile.c
7===================================================================
8--- Python-2.6.1.orig/Python/compile.c
9+++ Python-2.6.1/Python/compile.c
10@@ -32,7 +32,7 @@
11 #include "symtable.h"
12 #include "opcode.h"
13
14-int Py_OptimizeFlag = 0;
15+int Py_OptimizeFlag = 1;
16
17 #define DEFAULT_BLOCK_SIZE 16
18 #define DEFAULT_BLOCKS 8
19Index: Python-2.6.1/Modules/main.c
20===================================================================
21--- Python-2.6.1.orig/Modules/main.c
22+++ Python-2.6.1/Modules/main.c
23@@ -40,7 +40,7 @@ static char **orig_argv;
24 static int orig_argc;
25
26 /* command line options */
27-#define BASE_OPTS "3bBc:dEhiJm:OQ:sStuUvVW:xX?"
28+#define BASE_OPTS "3bBc:dEhiJm:NOQ:sStuUvVW:xX?"
29
30 #ifndef RISCOS
31 #define PROGRAM_OPTS BASE_OPTS
32@@ -69,8 +69,7 @@ Options and arguments (and corresponding
33 static char *usage_2 = "\
34 if stdin does not appear to be a terminal; also PYTHONINSPECT=x\n\
35 -m mod : run library module as a script (terminates option list)\n\
36--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
37--OO : remove doc-strings in addition to the -O optimizations\n\
38+-N : do NOT optimize generated bytecode\n\
39 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
40 -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\
41 -S : don't imply 'import site' on initialization\n\
42@@ -353,8 +352,8 @@ Py_Main(int argc, char **argv)
43
44 /* case 'J': reserved for Jython */
45
46- case 'O':
47- Py_OptimizeFlag++;
48+ case 'N':
49+ Py_OptimizeFlag=0;
50 break;
51
52 case 'B':
diff --git a/meta/packages/python/python-2.6.2/05-enable-ctypes-cross-build.patch b/meta/packages/python/python-2.6.2/05-enable-ctypes-cross-build.patch
deleted file mode 100644
index 58b8078068..0000000000
--- a/meta/packages/python/python-2.6.2/05-enable-ctypes-cross-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1# CTypes need to know the actual host we are building on.
2# Signed-Off: Michael Dietrich <mdt@emdete.de>
3
4Index: Python-2.6.1/setup.py
5===================================================================
6--- Python-2.6.1.orig/setup.py
7+++ Python-2.6.1/setup.py
8@@ -1656,16 +1656,16 @@ class PyBuildExt(build_ext):
9 ffi_configfile):
10 from distutils.dir_util import mkpath
11 mkpath(ffi_builddir)
12- config_args = []
13+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
14
15 # Pass empty CFLAGS because we'll just append the resulting
16 # CFLAGS to Python's; -g or -O2 is to be avoided.
17- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
18- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
19+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
20+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
21
22 res = os.system(cmd)
23 if res or not os.path.exists(ffi_configfile):
24- print "Failed to configure _ctypes module"
25+ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile )
26 return False
27
28 fficonfig = {}
diff --git a/meta/packages/python/python-2.6.2/99-ignore-optimization-flag.patch b/meta/packages/python/python-2.6.2/99-ignore-optimization-flag.patch
deleted file mode 100644
index 02dc44c847..0000000000
--- a/meta/packages/python/python-2.6.2/99-ignore-optimization-flag.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1# Reinstate the empty -O option to fix weird mixing of native and target
2# binaries and libraries with LD_LIBRARY_PATH when host==target
3#
4# Signed-off-by: Denys Dmytriyenko <denis@denix.org>
5
6Index: Python-2.6.1/Modules/main.c
7===================================================================
8--- Python-2.6.1-orig/Modules/main.c
9+++ Python-2.6.1/Modules/main.c
10@@ -352,6 +352,9 @@ Py_Main(int argc, char **argv)
11
12 /* case 'J': reserved for Jython */
13
14+ case 'O': /* ignore it */
15+ break;
16+
17 case 'N':
18 Py_OptimizeFlag=0;
19 break;
diff --git a/meta/packages/python/python-native-2.5.1/bindir-libdir.patch b/meta/packages/python/python-native-2.5.1/bindir-libdir.patch
deleted file mode 100644
index 999bddc449..0000000000
--- a/meta/packages/python/python-native-2.5.1/bindir-libdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1
2#
3# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200
7+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100
8@@ -78,8 +78,8 @@
9 exec_prefix= @exec_prefix@
10
11 # Expanded directories
12-BINDIR= $(exec_prefix)/bin
13-LIBDIR= $(exec_prefix)/lib
14+BINDIR= @bindir@
15+LIBDIR= @libdir@
16 MANDIR= @mandir@
17 INCLUDEDIR= @includedir@
18 CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta/packages/python/python-native-2.5.1/catchup-with-swig.patch b/meta/packages/python/python-native-2.5.1/catchup-with-swig.patch
deleted file mode 100644
index f049b759f4..0000000000
--- a/meta/packages/python/python-native-2.5.1/catchup-with-swig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: Python-2.5.1/Lib/distutils/command/build_ext.py
2===================================================================
3--- Python-2.5.1.orig/Lib/distutils/command/build_ext.py
4+++ Python-2.5.1/Lib/distutils/command/build_ext.py
5@@ -513,7 +513,7 @@ class build_ext (Command):
6 target_lang=language)
7
8
9- def swig_sources (self, sources, extension):
10+ def swig_sources (self, sources, extension=None):
11
12 """Walk the list of source files in 'sources', looking for SWIG
13 interface (.i) files. Run SWIG on all that are found, and
diff --git a/meta/packages/python/python-native-2.5.1/cross-distutils.patch b/meta/packages/python/python-native-2.5.1/cross-distutils.patch
deleted file mode 100644
index 3356c1abbe..0000000000
--- a/meta/packages/python/python-native-2.5.1/cross-distutils.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100
7+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100
8@@ -19,8 +19,8 @@
9 from errors import DistutilsPlatformError
10
11 # These are needed in a couple of spots, so just compute them once.
12-PREFIX = os.path.normpath(sys.prefix)
13-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
14+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
15+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
16
17 # python_build: (Boolean) if true, we're either building Python or
18 # building an extension with an un-installed Python, so we use
19@@ -192,7 +192,7 @@
20 else:
21 # The name of the config.h file changed in 2.2
22 config_h = 'pyconfig.h'
23- return os.path.join(inc_dir, config_h)
24+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
25
26
27 def get_makefile_filename():
28@@ -200,7 +200,7 @@
29 if python_build:
30 return os.path.join(os.path.dirname(sys.executable), "Makefile")
31 lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
32- return os.path.join(lib_dir, "config", "Makefile")
33+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
34
35
36 def parse_config_h(fp, g=None):
diff --git a/meta/packages/python/python-native-2.5.1/default-is-optimized.patch b/meta/packages/python/python-native-2.5.1/default-is-optimized.patch
deleted file mode 100644
index 6beeb6e022..0000000000
--- a/meta/packages/python/python-native-2.5.1/default-is-optimized.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: Python-2.5.1/Python/compile.c
2===================================================================
3--- Python-2.5.1.orig/Python/compile.c
4+++ Python-2.5.1/Python/compile.c
5@@ -30,7 +30,7 @@
6 #include "symtable.h"
7 #include "opcode.h"
8
9-int Py_OptimizeFlag = 0;
10+int Py_OptimizeFlag = 1;
11
12 /*
13 ISSUES:
diff --git a/meta/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch b/meta/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch
deleted file mode 100644
index 54109afd62..0000000000
--- a/meta/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
4#
5
6--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line
7+++ Python-2.4/Lib/distutils/command/build_scripts.py
8@@ -87,7 +87,7 @@
9 continue
10
11 match = first_line_re.match(first_line)
12- if match:
13+ if False: #match:
14 adjust = 1
15 post_interp = match.group(1) or ''
16
diff --git a/meta/packages/python/python-native-2.5.1/enable-ctypes-module.patch b/meta/packages/python/python-native-2.5.1/enable-ctypes-module.patch
deleted file mode 100644
index dd5adaf0e7..0000000000
--- a/meta/packages/python/python-native-2.5.1/enable-ctypes-module.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
2--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200
3+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100
4@@ -1321,16 +1329,16 @@
5 ffi_configfile):
6 from distutils.dir_util import mkpath
7 mkpath(ffi_builddir)
8- config_args = []
9+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
10
11 # Pass empty CFLAGS because we'll just append the resulting
12 # CFLAGS to Python's; -g or -O2 is to be avoided.
13- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
14- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
15+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
16+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
17
18 res = os.system(cmd)
19 if res or not os.path.exists(ffi_configfile):
20- print "Failed to configure _ctypes module"
21+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
22 return False
23
24 fficonfig = {}
25diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
26--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200
27+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100
28@@ -273,11 +273,13 @@
29 PyErr_NoMemory();
30 return NULL;
31 }
32+#if FFI_CLOSURES
33 p->pcl = MallocClosure();
34 if (p->pcl == NULL) {
35 PyErr_NoMemory();
36 goto error;
37 }
38+#endif
39
40 for (i = 0; i < nArgs; ++i) {
41 PyObject *cnv = PySequence_GetItem(converters, i);
42@@ -315,12 +317,14 @@
43 "ffi_prep_cif failed with %d", result);
44 goto error;
45 }
46+#if FFI_CLOSURES
47 result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
48 if (result != FFI_OK) {
49 PyErr_Format(PyExc_RuntimeError,
50 "ffi_prep_closure failed with %d", result);
51 goto error;
52 }
53+#endif
54
55 p->converters = converters;
56 p->callable = callable;
57@@ -328,8 +332,10 @@
58
59 error:
60 if (p) {
61+#if FFI_CLOSURES
62 if (p->pcl)
63 FreeClosure(p->pcl);
64+#endif
65 PyMem_Free(p);
66 }
67 return NULL;
68diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
69--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100
70+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100
71@@ -3419,7 +3419,9 @@
72 Py_CLEAR(self->paramflags);
73
74 if (self->thunk) {
75+#if FFI_CLOSURES
76 FreeClosure(self->thunk->pcl);
77+#endif
78 PyMem_Free(self->thunk);
79 self->thunk = NULL;
80 }
81diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
82--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200
83+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100
84@@ -68,7 +68,9 @@
85 };
86
87 typedef struct {
88+#if FFI_CLOSURES
89 ffi_closure *pcl; /* the C callable */
90+#endif
91 ffi_cif cif;
92 PyObject *converters;
93 PyObject *callable;
94diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
95--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200
96+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100
97@@ -27,7 +27,9 @@
98 /******************************************************************/
99
100 typedef union _tagITEM {
101+#if FFI_CLOSURES
102 ffi_closure closure;
103+#endif
104 union _tagITEM *next;
105 } ITEM;
106
diff --git a/meta/packages/python/python-native-2.5.1/fix-staging.patch b/meta/packages/python/python-native-2.5.1/fix-staging.patch
deleted file mode 100644
index 087c813fd4..0000000000
--- a/meta/packages/python/python-native-2.5.1/fix-staging.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1---
2 Lib/distutils/sysconfig.py | 10 ++++++++--
3 1 file changed, 8 insertions(+), 2 deletions(-)
4
5--- Python-2.5.1.orig/Lib/distutils/sysconfig.py
6+++ Python-2.5.1/Lib/distutils/sysconfig.py
7@@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref
8
9 If 'prefix' is supplied, use it instead of sys.prefix or
10 sys.exec_prefix -- i.e., ignore 'plat_specific'.
11 """
12 if prefix is None:
13- prefix = plat_specific and EXEC_PREFIX or PREFIX
14+ if plat_specific:
15+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include')
16+ else:
17+ prefix = plat_specific and EXEC_PREFIX or PREFIX
18 if os.name == "posix":
19 if python_build:
20 base = os.path.dirname(os.path.abspath(sys.executable))
21 if plat_specific:
22 inc_dir = base
23@@ -94,11 +97,14 @@ def get_python_lib(plat_specific=0, stan
24
25 If 'prefix' is supplied, use it instead of sys.prefix or
26 sys.exec_prefix -- i.e., ignore 'plat_specific'.
27 """
28 if prefix is None:
29- prefix = plat_specific and EXEC_PREFIX or PREFIX
30+ if plat_specific:
31+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib')
32+ else:
33+ prefix = plat_specific and EXEC_PREFIX or PREFIX
34
35 if os.name == "posix":
36 libpython = os.path.join(prefix,
37 "lib", "python" + get_python_version())
38 if standard_lib:
diff --git a/meta/packages/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch b/meta/packages/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch
deleted file mode 100644
index 2559e3a0e4..0000000000
--- a/meta/packages/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# $(exec_prefix) points to the wrong directory, when installing
2# a cross-build. @bindir@ and @libdir@ works better and doesn't
3# affect the native build.
4# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
5
6Index: Python-2.6.1/Makefile.pre.in
7===================================================================
8--- Python-2.6.1.orig/Makefile.pre.in
9+++ Python-2.6.1/Makefile.pre.in
10@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@
11 datarootdir= @datarootdir@
12
13 # Expanded directories
14-BINDIR= $(exec_prefix)/bin
15-LIBDIR= $(exec_prefix)/lib
16+BINDIR= @bindir@
17+LIBDIR= @libdir@
18 MANDIR= @mandir@
19 INCLUDEDIR= @includedir@
20 CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta/packages/python/python-native-2.6.1/sitecustomize.py b/meta/packages/python/python-native-2.6.1/sitecustomize.py
deleted file mode 100644
index 273901898a..0000000000
--- a/meta/packages/python/python-native-2.6.1/sitecustomize.py
+++ /dev/null
@@ -1,45 +0,0 @@
1# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
2# GPLv2 or later
3# Version: 20081123
4# Features:
5# * set proper default encoding
6# * enable readline completion in the interactive interpreter
7# * load command line history on startup
8# * save command line history on exit
9
10import os
11
12def __exithandler():
13 try:
14 readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
15 except IOError:
16 pass
17
18def __registerExitHandler():
19 import atexit
20 atexit.register( __exithandler )
21
22def __enableReadlineSupport():
23 readline.set_history_length( 1000 )
24 readline.parse_and_bind( "tab: complete" )
25 try:
26 readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
27 except IOError:
28 pass
29
30def __enableDefaultEncoding():
31 import sys
32 try:
33 sys.setdefaultencoding( "utf8" )
34 except LookupError:
35 pass
36
37import sys
38try:
39 import rlcompleter, readline
40except ImportError:
41 pass
42else:
43 __enableDefaultEncoding()
44 __registerExitHandler()
45 __enableReadlineSupport()
diff --git a/meta/packages/python/python-2.6.1/00-fix-bindir-libdir-for-cross.patch b/meta/packages/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
index 2559e3a0e4..2559e3a0e4 100644
--- a/meta/packages/python/python-2.6.1/00-fix-bindir-libdir-for-cross.patch
+++ b/meta/packages/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
diff --git a/meta/packages/python/python-native-2.6.1/04-default-is-optimized.patch b/meta/packages/python/python-native-2.6.5/04-default-is-optimized.patch
index 5131e0ba69..5131e0ba69 100644
--- a/meta/packages/python/python-native-2.6.1/04-default-is-optimized.patch
+++ b/meta/packages/python/python-native-2.6.5/04-default-is-optimized.patch
diff --git a/meta/packages/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch b/meta/packages/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
index f5e852a118..f5e852a118 100644
--- a/meta/packages/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch
+++ b/meta/packages/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
diff --git a/meta/packages/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch b/meta/packages/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
index 8354e266fa..8354e266fa 100644
--- a/meta/packages/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch
+++ b/meta/packages/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
diff --git a/meta/packages/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch b/meta/packages/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
index aa4393679f..aa4393679f 100644
--- a/meta/packages/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/packages/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/meta/packages/python/python-native-2.6.1/debug.patch b/meta/packages/python/python-native-2.6.5/debug.patch
index beb3adc6db..beb3adc6db 100644
--- a/meta/packages/python/python-native-2.6.1/debug.patch
+++ b/meta/packages/python/python-native-2.6.5/debug.patch
diff --git a/meta/packages/python/python-native-2.6.1/nohostlibs.patch b/meta/packages/python/python-native-2.6.5/nohostlibs.patch
index 7020f3c2a9..7020f3c2a9 100644
--- a/meta/packages/python/python-native-2.6.1/nohostlibs.patch
+++ b/meta/packages/python/python-native-2.6.5/nohostlibs.patch
diff --git a/meta/packages/python/python-2.6.1/sitecustomize.py b/meta/packages/python/python-native-2.6.5/sitecustomize.py
index 273901898a..273901898a 100644
--- a/meta/packages/python/python-2.6.1/sitecustomize.py
+++ b/meta/packages/python/python-native-2.6.5/sitecustomize.py
diff --git a/meta/packages/python/python-native_2.6.1.bb b/meta/packages/python/python-native_2.6.1.bb
deleted file mode 100644
index 943943589d..0000000000
--- a/meta/packages/python/python-native_2.6.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.3"
4
5SRC_URI = "\
6 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
7 file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
8 file://04-default-is-optimized.patch;patch=1 \
9 file://05-enable-ctypes-cross-build.patch;patch=1 \
10 file://10-distutils-fix-swig-parameter.patch;patch=1 \
11 file://11-distutils-never-modify-shebang-line.patch;patch=1 \
12 file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \
13 file://debug.patch;patch=1 \
14 file://nohostlibs.patch;patch=1 \
15"
16S = "${WORKDIR}/Python-${PV}"
17
18inherit native
19
20EXTRA_OEMAKE = '\
21 BUILD_SYS="" \
22 HOST_SYS="" \
23 LIBC="" \
24 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
25 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
26'
27
28NATIVE_INSTALL_WORKS = "1"
29do_install() {
30 oe_runmake 'DESTDIR=${D}' install
31 install -d ${D}${bindir}/
32 install -m 0755 Parser/pgen ${D}${bindir}/
33}
diff --git a/meta/packages/python/python-native_2.6.5.bb b/meta/packages/python/python-native_2.6.5.bb
new file mode 100644
index 0000000000..d766853c18
--- /dev/null
+++ b/meta/packages/python/python-native_2.6.5.bb
@@ -0,0 +1,31 @@
1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.3"
4
5SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
6 file://00-fix-bindir-libdir-for-cross.patch \
7 file://04-default-is-optimized.patch \
8 file://05-enable-ctypes-cross-build.patch \
9 file://10-distutils-fix-swig-parameter.patch \
10 file://11-distutils-never-modify-shebang-line.patch \
11 file://12-distutils-prefix-is-inside-staging-area.patch \
12 file://debug.patch \
13 file://nohostlibs.patch"
14S = "${WORKDIR}/Python-${PV}"
15
16inherit native
17
18EXTRA_OEMAKE = '\
19 BUILD_SYS="" \
20 HOST_SYS="" \
21 LIBC="" \
22 STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
23 STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
24'
25
26NATIVE_INSTALL_WORKS = "1"
27do_install() {
28 oe_runmake 'DESTDIR=${D}' install
29 install -d ${D}${bindir}/
30 install -m 0755 Parser/pgen ${D}${bindir}/
31}
diff --git a/meta/packages/python/python-2.6.2/00-fix-bindir-libdir-for-cross.patch b/meta/packages/python/python/00-fix-bindir-libdir-for-cross.patch
index 2559e3a0e4..2559e3a0e4 100644
--- a/meta/packages/python/python-2.6.2/00-fix-bindir-libdir-for-cross.patch
+++ b/meta/packages/python/python/00-fix-bindir-libdir-for-cross.patch
diff --git a/meta/packages/python/python-2.6.1/01-use-proper-tools-for-cross-build.patch b/meta/packages/python/python/01-use-proper-tools-for-cross-build.patch
index e89faa4fb0..e89faa4fb0 100644
--- a/meta/packages/python/python-2.6.1/01-use-proper-tools-for-cross-build.patch
+++ b/meta/packages/python/python/01-use-proper-tools-for-cross-build.patch
diff --git a/meta/packages/python/python-2.6.2/02-remove-test-for-cross.patch b/meta/packages/python/python/02-remove-test-for-cross.patch
index 48386ea462..b1c0bfb859 100644
--- a/meta/packages/python/python-2.6.2/02-remove-test-for-cross.patch
+++ b/meta/packages/python/python/02-remove-test-for-cross.patch
@@ -5,16 +5,16 @@
5# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 5# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
6Index: Python-2.6.1/configure.in 6Index: Python-2.6.1/configure.in
7=================================================================== 7===================================================================
8--- Python-2.6.1.orig/configure.in 8--- Python-2.6.5.orig/configure.in 2010-07-06 04:37:09.000000000 -0700
9+++ Python-2.6.1/configure.in 9+++ Python-2.6.5/configure.in 2010-07-06 04:40:18.000000000 -0700
10@@ -2556,38 +2556,6 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_ 10@@ -2697,50 +2697,6 @@
11 AC_CHECK_LIB(resolv, inet_aton) 11 AC_CHECK_LIB(resolv, inet_aton)
12 ) 12 )
13 13
14-# On Tru64, chflags seems to be present, but calling it will 14-# On Tru64, chflags seems to be present, but calling it will
15-# exit Python 15-# exit Python
16-AC_MSG_CHECKING(for chflags) 16-AC_CACHE_CHECK([for chflags], [ac_cv_have_chflags], [dnl
17-AC_TRY_RUN([ 17-AC_TRY_RUN([[
18-#include <sys/stat.h> 18-#include <sys/stat.h>
19-#include <unistd.h> 19-#include <unistd.h>
20-int main(int argc, char*argv[]) 20-int main(int argc, char*argv[])
@@ -23,13 +23,19 @@ Index: Python-2.6.1/configure.in
23- return 1; 23- return 1;
24- return 0; 24- return 0;
25-} 25-}
26-],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.) 26-]], ac_cv_have_chflags=yes,
27- AC_MSG_RESULT(yes), 27- ac_cv_have_chflags=no,
28- AC_MSG_RESULT(no) 28- ac_cv_have_chflags=cross)
29-) 29-])
30-if test "$ac_cv_have_chflags" = cross ; then
31- AC_CHECK_FUNC([chflags], [ac_cv_have_chflags="yes"], [ac_cv_have_chflags="no"])
32-fi
33-if test "$ac_cv_have_chflags" = yes ; then
34- AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
35-fi
30- 36-
31-AC_MSG_CHECKING(for lchflags) 37-AC_CACHE_CHECK([for lchflags], [ac_cv_have_lchflags], [dnl
32-AC_TRY_RUN([ 38-AC_TRY_RUN([[
33-#include <sys/stat.h> 39-#include <sys/stat.h>
34-#include <unistd.h> 40-#include <unistd.h>
35-int main(int argc, char*argv[]) 41-int main(int argc, char*argv[])
@@ -38,15 +44,21 @@ Index: Python-2.6.1/configure.in
38- return 1; 44- return 1;
39- return 0; 45- return 0;
40-} 46-}
41-],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.) 47-]], ac_cv_have_lchflags=yes,
42- AC_MSG_RESULT(yes), 48- ac_cv_have_lchflags=no,
43- AC_MSG_RESULT(no) 49- ac_cv_have_lchflags=cross)
44-) 50-])
51-if test "$ac_cv_have_lchflags" = cross ; then
52- AC_CHECK_FUNC([lchflags], [ac_cv_have_lchflags="yes"], [ac_cv_have_lchflags="no"])
53-fi
54-if test "$ac_cv_have_lchflags" = yes ; then
55- AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
56-fi
45- 57-
46 dnl Check if system zlib has *Copy() functions 58 dnl Check if system zlib has *Copy() functions
47 dnl 59 dnl
48 dnl On MacOSX the linker will search for dylibs on the entire linker path 60 dnl On MacOSX the linker will search for dylibs on the entire linker path
49@@ -3649,45 +3617,6 @@ else 61@@ -3844,45 +3800,6 @@
50 AC_MSG_RESULT(no) 62 AC_MSG_RESULT(no)
51 fi 63 fi
52 64
diff --git a/meta/packages/python/python-2.6.1/03-fix-tkinter-detection.patch b/meta/packages/python/python/03-fix-tkinter-detection.patch
index a1a385a07c..a1a385a07c 100644
--- a/meta/packages/python/python-2.6.1/03-fix-tkinter-detection.patch
+++ b/meta/packages/python/python/03-fix-tkinter-detection.patch
diff --git a/meta/packages/python/python-2.6.1/04-default-is-optimized.patch b/meta/packages/python/python/04-default-is-optimized.patch
index 805f4f696c..805f4f696c 100644
--- a/meta/packages/python/python-2.6.1/04-default-is-optimized.patch
+++ b/meta/packages/python/python/04-default-is-optimized.patch
diff --git a/meta/packages/python/python-2.6.1/05-enable-ctypes-cross-build.patch b/meta/packages/python/python/05-enable-ctypes-cross-build.patch
index 58b8078068..58b8078068 100644
--- a/meta/packages/python/python-2.6.1/05-enable-ctypes-cross-build.patch
+++ b/meta/packages/python/python/05-enable-ctypes-cross-build.patch
diff --git a/meta/packages/python/python-2.6.1/99-ignore-optimization-flag.patch b/meta/packages/python/python/99-ignore-optimization-flag.patch
index 02dc44c847..02dc44c847 100644
--- a/meta/packages/python/python-2.6.1/99-ignore-optimization-flag.patch
+++ b/meta/packages/python/python/99-ignore-optimization-flag.patch
diff --git a/meta/packages/python/python-2.6.2/sitecustomize.py b/meta/packages/python/python/sitecustomize.py
index 273901898a..273901898a 100644
--- a/meta/packages/python/python-2.6.2/sitecustomize.py
+++ b/meta/packages/python/python/sitecustomize.py
diff --git a/meta/packages/python/python_2.6.1.bb b/meta/packages/python/python_2.6.1.bb
deleted file mode 100644
index 46e14f84e7..0000000000
--- a/meta/packages/python/python_2.6.1.bb
+++ /dev/null
@@ -1,113 +0,0 @@
1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4PR = "${INC_PR}.0"
5
6SRC_URI = "\
7 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
8 file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
9 file://01-use-proper-tools-for-cross-build.patch;patch=1 \
10 file://02-remove-test-for-cross.patch;patch=1 \
11 file://03-fix-tkinter-detection.patch;patch=1 \
12 file://04-default-is-optimized.patch;patch=1 \
13 file://05-enable-ctypes-cross-build.patch;patch=1 \
14 file://06-libffi-enable-default-mips.patch;patch=1 \
15 file://07-export-grammer.patch;patch=1 \
16 file://99-ignore-optimization-flag.patch;patch=1 \
17 \
18# not yet pushed forward
19# sitecustomize, sitebranding
20 \
21# file://05-install.patch;patch=1 \
22# file://06-fix-urllib-exception.patch;patch=1 \
23# file://16-bug1179-imageop.patch;patch=1 \
24# file://13-set-wakeup-fix.patch;patch=1 \
25 \
26 file://sitecustomize.py \
27"
28S = "${WORKDIR}/Python-${PV}"
29
30inherit autotools
31
32# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
33#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
34TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
35TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
36
37#
38# copy config.h and an appropriate Makefile for distutils.sysconfig
39# which laters uses the information out of these to compile extensions
40#
41do_compile_prepend() {
42 install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
43 install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
44 install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
45 install -m 0644 Makefile Makefile.orig
46 install -m 0644 Makefile Makefile.backup
47 sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
48 install -m 0644 Makefile Makefile.backup
49 sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
50 install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
51}
52
53do_compile() {
54 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
55 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
56 STAGING_LIBDIR=${STAGING_LIBDIR} \
57 STAGING_INCDIR=${STAGING_INCDIR} \
58 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
59 OPT="${CFLAGS}" libpython${PYTHON_MAJMIN}.so
60
61 oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
62
63 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
64 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
65 STAGING_LIBDIR=${STAGING_LIBDIR} \
66 STAGING_INCDIR=${STAGING_INCDIR} \
67 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
68 OPT="${CFLAGS}"
69}
70
71do_install() {
72 install -m 0644 Makefile.orig Makefile
73
74 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
75 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
76 STAGING_LIBDIR=${STAGING_LIBDIR} \
77 STAGING_INCDIR=${STAGING_INCDIR} \
78 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
79 DESTDIR=${D} LIBDIR=${libdir} install
80
81 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
82
83 # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144
84 sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
85}
86
87require python-${PYTHON_MAJMIN}-manifest.inc
88
89# manual dependency additions
90RPROVIDES_python-core = "python"
91RRECOMMENDS_python-core = "python-readline"
92RRECOMMENDS_python-crypt = "openssl"
93
94# add sitecustomize
95FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
96
97# 2to3
98FILES_python-core += "${bindir}/2to3"
99
100# package libpython
101PACKAGES =+ "libpython2"
102FILES_libpython2 = "${libdir}/libpython*.so.*"
103
104# catch debug extensions (isn't that already in python-core-dbg?)
105FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
106
107# catch all the rest (unsorted)
108PACKAGES += "python-misc"
109FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
110
111# catch manpage
112PACKAGES += "python-man"
113FILES_python-man = "${datadir}/man"
diff --git a/meta/packages/python/python_2.6.2.bb b/meta/packages/python/python_2.6.5.bb
index e17aa58201..9658fd48dc 100644
--- a/meta/packages/python/python_2.6.2.bb
+++ b/meta/packages/python/python_2.6.5.bb
@@ -6,22 +6,13 @@ PR = "${INC_PR}.2"
6 6
7SRC_URI = "\ 7SRC_URI = "\
8 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 8 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
9 file://00-fix-bindir-libdir-for-cross.patch;patch=1 \ 9 file://00-fix-bindir-libdir-for-cross.patch \
10 file://01-use-proper-tools-for-cross-build.patch;patch=1 \ 10 file://01-use-proper-tools-for-cross-build.patch \
11 file://02-remove-test-for-cross.patch;patch=1 \ 11 file://02-remove-test-for-cross.patch \
12 file://03-fix-tkinter-detection.patch;patch=1 \ 12 file://03-fix-tkinter-detection.patch \
13 file://04-default-is-optimized.patch;patch=1 \ 13 file://04-default-is-optimized.patch \
14 file://05-enable-ctypes-cross-build.patch;patch=1 \ 14 file://05-enable-ctypes-cross-build.patch \
15 file://99-ignore-optimization-flag.patch;patch=1 \ 15 file://99-ignore-optimization-flag.patch \
16 \
17# not yet pushed forward
18# sitebranding
19 \
20# file://05-install.patch;patch=1 \
21# file://06-fix-urllib-exception.patch;patch=1 \
22# file://16-bug1179-imageop.patch;patch=1 \
23# file://13-set-wakeup-fix.patch;patch=1 \
24 \
25 file://sitecustomize.py \ 16 file://sitecustomize.py \
26" 17"
27S = "${WORKDIR}/Python-${PV}" 18S = "${WORKDIR}/Python-${PV}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 02:49:50 +0000