diff options
author | Richard Purdie <richard@openedhand.com> | 2008-08-25 20:33:55 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-08-25 20:33:55 +0000 |
commit | 16e6877c4ce53fd3be88dd77263a03e7d88c3163 (patch) | |
tree | 831004ca391e04c8deaace28b15cb602c0848c77 /meta-extras/packages | |
parent | 07eeb6a8b6d671db7566f839ab22a26b6f118077 (diff) | |
download | poky-16e6877c4ce53fd3be88dd77263a03e7d88c3163.tar.gz |
python: Promote from meta-extras to meta
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5092 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages')
38 files changed, 0 insertions, 1589 deletions
diff --git a/meta-extras/packages/python/fix-path.inc b/meta-extras/packages/python/fix-path.inc deleted file mode 100644 index 0738c59ada..0000000000 --- a/meta-extras/packages/python/fix-path.inc +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | do_install_append() { | ||
2 | for i in `find ${D} -name "*.py"` ; do \ | ||
3 | sed -i -e s:${D}::g $i | ||
4 | done | ||
5 | |||
6 | for i in `find ${D} -name "*.la"` ; do \ | ||
7 | sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i | ||
8 | done | ||
9 | |||
10 | if test -e ${D}${bindir} ; then | ||
11 | for i in ${D}${bindir}/* ; do \ | ||
12 | sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i | ||
13 | done | ||
14 | fi | ||
15 | |||
16 | if test -e ${D}${sbindir} ; then | ||
17 | for i in ${D}${sbindir}/* ; do \ | ||
18 | sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i | ||
19 | done | ||
20 | fi | ||
21 | } | ||
22 | |||
diff --git a/meta-extras/packages/python/python-2.5-manifest.inc b/meta-extras/packages/python/python-2.5-manifest.inc deleted file mode 100644 index c098494d17..0000000000 --- a/meta-extras/packages/python/python-2.5-manifest.inc +++ /dev/null | |||
@@ -1,306 +0,0 @@ | |||
1 | ######################################################################################################################## | ||
2 | ### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008 | ||
3 | ### | ||
4 | ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy | ||
5 | ### | ||
6 | ### Warning: Manual edits will be lost! | ||
7 | ### | ||
8 | ######################################################################################################################## | ||
9 | |||
10 | |||
11 | PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " | ||
12 | |||
13 | PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " | ||
14 | |||
15 | DESCRIPTION_python-profile="Python Basic Profiling Support" | ||
16 | PR_python-profile="ml0" | ||
17 | RDEPENDS_python-profile="python-core" | ||
18 | FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " | ||
19 | |||
20 | DESCRIPTION_python-threading="Python Threading & Synchronization Support" | ||
21 | PR_python-threading="ml0" | ||
22 | RDEPENDS_python-threading="python-core python-lang" | ||
23 | FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " | ||
24 | |||
25 | DESCRIPTION_python-distutils="Python Distribution Utilities" | ||
26 | PR_python-distutils="ml0" | ||
27 | RDEPENDS_python-distutils="python-core" | ||
28 | FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " | ||
29 | |||
30 | DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" | ||
31 | PR_python-textutils="ml0" | ||
32 | RDEPENDS_python-textutils="python-core python-io python-re python-stringold" | ||
33 | FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " | ||
34 | |||
35 | DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" | ||
36 | PR_python-codecs="ml0" | ||
37 | RDEPENDS_python-codecs="python-core python-lang" | ||
38 | FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " | ||
39 | |||
40 | DESCRIPTION_python-ctypes="Python C Types Support" | ||
41 | PR_python-ctypes="ml0" | ||
42 | RDEPENDS_python-ctypes="python-core" | ||
43 | FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " | ||
44 | |||
45 | DESCRIPTION_python-pickle="Python Persistence Support" | ||
46 | PR_python-pickle="ml0" | ||
47 | RDEPENDS_python-pickle="python-core python-codecs python-io python-re" | ||
48 | FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " | ||
49 | |||
50 | DESCRIPTION_python-datetime="Python Calendar and Time support" | ||
51 | PR_python-datetime="ml0" | ||
52 | RDEPENDS_python-datetime="python-core python-codecs" | ||
53 | FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " | ||
54 | |||
55 | DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" | ||
56 | PR_python-core="ml0" | ||
57 | RDEPENDS_python-core="" | ||
58 | FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " | ||
59 | |||
60 | DESCRIPTION_python-io="Python Low-Level I/O" | ||
61 | PR_python-io="ml0" | ||
62 | RDEPENDS_python-io="python-core python-math" | ||
63 | FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " | ||
64 | |||
65 | DESCRIPTION_python-compiler="Python Compiler Support" | ||
66 | PR_python-compiler="ml0" | ||
67 | RDEPENDS_python-compiler="python-core" | ||
68 | FILES_python-compiler="${libdir}/python2.5/compiler " | ||
69 | |||
70 | DESCRIPTION_python-compression="Python High Level Compression Support" | ||
71 | PR_python-compression="ml0" | ||
72 | RDEPENDS_python-compression="python-core python-zlib" | ||
73 | FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " | ||
74 | |||
75 | DESCRIPTION_python-re="Python Regular Expression APIs" | ||
76 | PR_python-re="ml0" | ||
77 | RDEPENDS_python-re="python-core" | ||
78 | FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " | ||
79 | |||
80 | DESCRIPTION_python-xmlrpc="Python XMLRPC Support" | ||
81 | PR_python-xmlrpc="ml0" | ||
82 | RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" | ||
83 | FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " | ||
84 | |||
85 | DESCRIPTION_python-terminal="Python Terminal Controlling Support" | ||
86 | PR_python-terminal="ml0" | ||
87 | RDEPENDS_python-terminal="python-core python-io" | ||
88 | FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " | ||
89 | |||
90 | DESCRIPTION_python-email="Python Email Support" | ||
91 | PR_python-email="ml0" | ||
92 | RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" | ||
93 | FILES_python-email="${libdir}/python2.5/email " | ||
94 | |||
95 | DESCRIPTION_python-image="Python Graphical Image Handling" | ||
96 | PR_python-image="ml0" | ||
97 | RDEPENDS_python-image="python-core" | ||
98 | FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " | ||
99 | |||
100 | DESCRIPTION_python-tests="Python Tests" | ||
101 | PR_python-tests="ml0" | ||
102 | RDEPENDS_python-tests="python-core" | ||
103 | FILES_python-tests="${libdir}/python2.5/test " | ||
104 | |||
105 | DESCRIPTION_python-core-dbg="Python core module debug information" | ||
106 | PR_python-core-dbg="ml0" | ||
107 | RDEPENDS_python-core-dbg="python-core" | ||
108 | FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " | ||
109 | |||
110 | DESCRIPTION_python-resource="Python Resource Control Interface" | ||
111 | PR_python-resource="ml0" | ||
112 | RDEPENDS_python-resource="python-core" | ||
113 | FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " | ||
114 | |||
115 | DESCRIPTION_python-devel="Python Development Package" | ||
116 | PR_python-devel="ml0" | ||
117 | RDEPENDS_python-devel="python-core" | ||
118 | FILES_python-devel="${includedir} ${libdir}/python2.5/config " | ||
119 | |||
120 | DESCRIPTION_python-math="Python Math Support" | ||
121 | PR_python-math="ml0" | ||
122 | RDEPENDS_python-math="python-core" | ||
123 | FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " | ||
124 | |||
125 | DESCRIPTION_python-hotshot="Python Hotshot Profiler" | ||
126 | PR_python-hotshot="ml0" | ||
127 | RDEPENDS_python-hotshot="python-core" | ||
128 | FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " | ||
129 | |||
130 | DESCRIPTION_python-unixadmin="Python Unix Administration Support" | ||
131 | PR_python-unixadmin="ml0" | ||
132 | RDEPENDS_python-unixadmin="python-core" | ||
133 | FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " | ||
134 | |||
135 | DESCRIPTION_python-syslog="Python's Syslog Interface" | ||
136 | PR_python-syslog="ml0" | ||
137 | RDEPENDS_python-syslog="python-core" | ||
138 | FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " | ||
139 | |||
140 | DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" | ||
141 | PR_python-tkinter="ml0" | ||
142 | RDEPENDS_python-tkinter="python-core" | ||
143 | FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " | ||
144 | |||
145 | DESCRIPTION_python-gdbm="Python GNU Database Support" | ||
146 | PR_python-gdbm="ml0" | ||
147 | RDEPENDS_python-gdbm="python-core" | ||
148 | FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " | ||
149 | |||
150 | DESCRIPTION_python-fcntl="Python's fcntl Interface" | ||
151 | PR_python-fcntl="ml0" | ||
152 | RDEPENDS_python-fcntl="python-core" | ||
153 | FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " | ||
154 | |||
155 | DESCRIPTION_python-netclient="Python Internet Protocol Clients" | ||
156 | PR_python-netclient="ml0" | ||
157 | RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" | ||
158 | FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " | ||
159 | |||
160 | DESCRIPTION_python-pprint="Python Pretty-Print Support" | ||
161 | PR_python-pprint="ml0" | ||
162 | RDEPENDS_python-pprint="python-core" | ||
163 | FILES_python-pprint="${libdir}/python2.5/pprint.* " | ||
164 | |||
165 | DESCRIPTION_python-netserver="Python Internet Protocol Servers" | ||
166 | PR_python-netserver="ml0" | ||
167 | RDEPENDS_python-netserver="python-core python-netclient" | ||
168 | FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " | ||
169 | |||
170 | DESCRIPTION_python-curses="Python Curses Support" | ||
171 | PR_python-curses="ml0" | ||
172 | RDEPENDS_python-curses="python-core" | ||
173 | FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " | ||
174 | |||
175 | DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" | ||
176 | PR_python-smtpd="ml0" | ||
177 | RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" | ||
178 | FILES_python-smtpd="${bindir}/smtpd.* " | ||
179 | |||
180 | DESCRIPTION_python-html="Python HTML Processing" | ||
181 | PR_python-html="ml0" | ||
182 | RDEPENDS_python-html="python-core" | ||
183 | FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " | ||
184 | |||
185 | DESCRIPTION_python-readline="Python Readline Support" | ||
186 | PR_python-readline="ml0" | ||
187 | RDEPENDS_python-readline="python-core" | ||
188 | FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " | ||
189 | |||
190 | DESCRIPTION_python-subprocess="Python Subprocess Support" | ||
191 | PR_python-subprocess="ml0" | ||
192 | RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" | ||
193 | FILES_python-subprocess="${libdir}/python2.5/subprocess.* " | ||
194 | |||
195 | DESCRIPTION_python-pydoc="Python Interactive Help Support" | ||
196 | PR_python-pydoc="ml0" | ||
197 | RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" | ||
198 | FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " | ||
199 | |||
200 | DESCRIPTION_python-logging="Python Logging Support" | ||
201 | PR_python-logging="ml0" | ||
202 | RDEPENDS_python-logging="python-core python-io python-lang python-stringold" | ||
203 | FILES_python-logging="${libdir}/python2.5/logging " | ||
204 | |||
205 | DESCRIPTION_python-mailbox="Python Mailbox Format Support" | ||
206 | PR_python-mailbox="ml0" | ||
207 | RDEPENDS_python-mailbox="python-core python-mime" | ||
208 | FILES_python-mailbox="${libdir}/python2.5/mailbox.* " | ||
209 | |||
210 | DESCRIPTION_python-xml="Python basic XML support." | ||
211 | PR_python-xml="ml0" | ||
212 | RDEPENDS_python-xml="python-core python-re python-netclient" | ||
213 | FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " | ||
214 | |||
215 | DESCRIPTION_python-mime="Python MIME Handling APIs" | ||
216 | PR_python-mime="ml0" | ||
217 | RDEPENDS_python-mime="python-core python-io" | ||
218 | FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " | ||
219 | |||
220 | DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" | ||
221 | PR_python-sqlite3="ml2" | ||
222 | RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib" | ||
223 | FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* " | ||
224 | |||
225 | DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests" | ||
226 | PR_python-sqlite3-tests="ml0" | ||
227 | RDEPENDS_python-sqlite3-tests="python-core python-sqlite3" | ||
228 | FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test " | ||
229 | |||
230 | DESCRIPTION_python-unittest="Python Unit Testing Framework" | ||
231 | PR_python-unittest="ml0" | ||
232 | RDEPENDS_python-unittest="python-core python-stringold python-lang" | ||
233 | FILES_python-unittest="${libdir}/python2.5/unittest.* " | ||
234 | |||
235 | DESCRIPTION_python-stringold="Python String APIs [deprecated]" | ||
236 | PR_python-stringold="ml0" | ||
237 | RDEPENDS_python-stringold="python-core python-re" | ||
238 | FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " | ||
239 | |||
240 | DESCRIPTION_python-robotparser="Python robots.txt parser" | ||
241 | PR_python-robotparser="ml0" | ||
242 | RDEPENDS_python-robotparser="python-core python-netclient" | ||
243 | FILES_python-robotparser="${libdir}/python2.5/robotparser.* " | ||
244 | |||
245 | DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" | ||
246 | PR_python-lib-old-and-deprecated="ml0" | ||
247 | RDEPENDS_python-lib-old-and-deprecated="python-core" | ||
248 | FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " | ||
249 | |||
250 | DESCRIPTION_python-compile="Python Bytecode Compilation Support" | ||
251 | PR_python-compile="ml0" | ||
252 | RDEPENDS_python-compile="python-core" | ||
253 | FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " | ||
254 | |||
255 | DESCRIPTION_python-debugger="Python Debugger" | ||
256 | PR_python-debugger="ml0" | ||
257 | RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" | ||
258 | FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " | ||
259 | |||
260 | DESCRIPTION_python-shell="Python Shell-Like Functionality" | ||
261 | PR_python-shell="ml0" | ||
262 | RDEPENDS_python-shell="python-core python-re" | ||
263 | FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " | ||
264 | |||
265 | DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" | ||
266 | PR_python-bsddb="ml0" | ||
267 | RDEPENDS_python-bsddb="python-core" | ||
268 | FILES_python-bsddb="${libdir}/python2.5/bsddb " | ||
269 | |||
270 | DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" | ||
271 | PR_python-mmap="ml0" | ||
272 | RDEPENDS_python-mmap="python-core python-io" | ||
273 | FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " | ||
274 | |||
275 | DESCRIPTION_python-zlib="Python zlib Support." | ||
276 | PR_python-zlib="ml0" | ||
277 | RDEPENDS_python-zlib="python-core" | ||
278 | FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " | ||
279 | |||
280 | DESCRIPTION_python-db="Python File-Based Database Support" | ||
281 | PR_python-db="ml0" | ||
282 | RDEPENDS_python-db="python-core" | ||
283 | FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " | ||
284 | |||
285 | DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" | ||
286 | PR_python-crypt="ml1" | ||
287 | RDEPENDS_python-crypt="python-core" | ||
288 | FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " | ||
289 | |||
290 | DESCRIPTION_python-idle="Python Integrated Development Environment" | ||
291 | PR_python-idle="ml0" | ||
292 | RDEPENDS_python-idle="python-core python-tkinter" | ||
293 | FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " | ||
294 | |||
295 | DESCRIPTION_python-lang="Python Low-Level Language Support" | ||
296 | PR_python-lang="ml0" | ||
297 | RDEPENDS_python-lang="python-core" | ||
298 | FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " | ||
299 | |||
300 | DESCRIPTION_python-audio="Python Audio Handling" | ||
301 | PR_python-audio="ml0" | ||
302 | RDEPENDS_python-audio="python-core" | ||
303 | FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " | ||
304 | |||
305 | |||
306 | |||
diff --git a/meta-extras/packages/python/python-2.5.2/autohell.patch b/meta-extras/packages/python/python-2.5.2/autohell.patch deleted file mode 100644 index 32977955d4..0000000000 --- a/meta-extras/packages/python/python-2.5.2/autohell.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Index: 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-extras/packages/python/python-2.5.2/bindir-libdir.patch b/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch deleted file mode 100644 index 047c358a55..0000000000 --- a/meta-extras/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 | |||
6 | Index: 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-extras/packages/python/python-2.5.2/crosscompile.patch b/meta-extras/packages/python/python-2.5.2/crosscompile.patch deleted file mode 100644 index f1b1c6f3e0..0000000000 --- a/meta-extras/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 | # | ||
4 | Index: 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) \ | ||
78 | Index: 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-extras/packages/python/python-2.5.2/default-is-optimized.patch b/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch deleted file mode 100644 index 6beeb6e022..0000000000 --- a/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: 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-extras/packages/python/python-2.5.2/enable-ctypes-module.patch b/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch deleted file mode 100644 index dd5adaf0e7..0000000000 --- a/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | diff -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 = {} | ||
25 | diff -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; | ||
68 | diff -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 | } | ||
81 | diff -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; | ||
94 | diff -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-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch deleted file mode 100644 index 93bd343381..0000000000 --- a/meta-extras/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 | |||
6 | Index: 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-extras/packages/python/python-2.5.2/sitebranding.patch b/meta-extras/packages/python/python-2.5.2/sitebranding.patch deleted file mode 100644 index c6e486ae97..0000000000 --- a/meta-extras/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 | |||
6 | Index: 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-extras/packages/python/python-2.5.2/sitecustomize.py b/meta-extras/packages/python/python-2.5.2/sitecustomize.py deleted file mode 100644 index ec626b4b63..0000000000 --- a/meta-extras/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 | |||
10 | import os | ||
11 | |||
12 | def __exithandler(): | ||
13 | try: | ||
14 | readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) | ||
15 | except IOError: | ||
16 | pass | ||
17 | |||
18 | def __registerExitHandler(): | ||
19 | import atexit | ||
20 | atexit.register( __exithandler ) | ||
21 | |||
22 | def __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 | |||
29 | def __enableDefaultEncoding(): | ||
30 | import sys | ||
31 | try: | ||
32 | sys.setdefaultencoding('utf8') | ||
33 | except LookupError: | ||
34 | pass | ||
35 | |||
36 | import sys | ||
37 | try: | ||
38 | import rlcompleter, readline | ||
39 | except ImportError: | ||
40 | pass | ||
41 | else: | ||
42 | __enableDefaultEncoding() | ||
43 | __registerExitHandler() | ||
44 | __enableReadlineSupport() | ||
diff --git a/meta-extras/packages/python/python-gst/python-path.patch b/meta-extras/packages/python/python-gst/python-path.patch deleted file mode 100644 index 465d5b180a..0000000000 --- a/meta-extras/packages/python/python-gst/python-path.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Index: gst-python-0.10.7/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- gst-python-0.10.7.orig/acinclude.m4 2007-03-02 14:10:28.652128590 +0100 | ||
4 | +++ gst-python-0.10.7/acinclude.m4 2007-03-02 14:41:00.106728708 +0100 | ||
5 | @@ -43,12 +43,19 @@ | ||
6 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
7 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
8 | dnl deduce PYTHON_INCLUDES | ||
9 | + | ||
10 | +AC_ARG_WITH(python-includes, | ||
11 | + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
12 | +if test x$py_exec_prefix != x; then | ||
13 | +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
14 | +else | ||
15 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
16 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
17 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
18 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
19 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
20 | fi | ||
21 | +fi | ||
22 | AC_SUBST(PYTHON_INCLUDES) | ||
23 | dnl check if the headers exist: | ||
24 | save_CPPFLAGS="$CPPFLAGS" | ||
diff --git a/meta-extras/packages/python/python-gst_0.10.8.bb b/meta-extras/packages/python/python-gst_0.10.8.bb deleted file mode 100644 index 224d24b59a..0000000000 --- a/meta-extras/packages/python/python-gst_0.10.8.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | DESCRIPTION = "Python Gstreamer bindings" | ||
2 | SECTION = "devel/python" | ||
3 | LICENSE = "LGPL" | ||
4 | DEPENDS = "gstreamer gst-plugins-base python-pygobject" | ||
5 | PR = "ml1" | ||
6 | |||
7 | SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ | ||
8 | file://python-path.patch;patch=1" | ||
9 | S = "${WORKDIR}/gst-python-${PV}" | ||
10 | |||
11 | inherit autotools distutils-base pkgconfig | ||
12 | |||
13 | EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" | ||
14 | |||
15 | do_configure_prepend() { | ||
16 | install -d ${S}/m4 | ||
17 | install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/ | ||
18 | } | ||
19 | |||
20 | do_stage() { | ||
21 | autotools_stage_all | ||
22 | } | ||
23 | |||
24 | FILES_${PN} += "${datadir}/gst-python" | ||
25 | FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs" | ||
26 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/" | ||
diff --git a/meta-extras/packages/python/python-imaging/path.patch b/meta-extras/packages/python/python-imaging/path.patch deleted file mode 100644 index 1dc467a56d..0000000000 --- a/meta-extras/packages/python/python-imaging/path.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Index: Imaging-1.1.5/setup.py | ||
2 | =================================================================== | ||
3 | --- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100 | ||
4 | +++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200 | ||
5 | @@ -28,12 +28,13 @@ | ||
6 | # | ||
7 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
8 | |||
9 | -FREETYPE_ROOT = None | ||
10 | -JPEG_ROOT = None | ||
11 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
12 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
13 | TIFF_ROOT = None | ||
14 | -ZLIB_ROOT = None | ||
15 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
16 | TCL_ROOT = None | ||
17 | |||
18 | + | ||
19 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
20 | |||
21 | # -------------------------------------------------------------------- | ||
22 | @@ -175,15 +176,6 @@ | ||
23 | add_directory(include_dirs, include_root) | ||
24 | |||
25 | # | ||
26 | - # add standard directories | ||
27 | - | ||
28 | - add_directory(library_dirs, "/usr/local/lib") | ||
29 | - add_directory(include_dirs, "/usr/local/include") | ||
30 | - | ||
31 | - add_directory(library_dirs, "/usr/lib") | ||
32 | - add_directory(include_dirs, "/usr/include") | ||
33 | - | ||
34 | - # | ||
35 | # insert new dirs *before* default libs, to avoid conflicts | ||
36 | # between Python PYD stub libs and real libraries | ||
37 | |||
diff --git a/meta-extras/packages/python/python-imaging_1.1.6.bb b/meta-extras/packages/python/python-imaging_1.1.6.bb deleted file mode 100644 index 9f3b6323dd..0000000000 --- a/meta-extras/packages/python/python-imaging_1.1.6.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | DESCRIPTION = "Python Imaging Library" | ||
2 | SECTION = "devel/python" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "GPL" | ||
5 | DEPENDS = "freetype jpeg tiff" | ||
6 | RDEPENDS = "python-lang python-stringold" | ||
7 | SRCNAME = "Imaging" | ||
8 | PR = "ml0" | ||
9 | |||
10 | SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ | ||
11 | file://path.patch;patch=1" | ||
12 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
13 | |||
14 | inherit distutils | ||
15 | |||
16 | do_compile() { | ||
17 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
18 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
19 | distutils_do_compile | ||
20 | } | ||
21 | |||
22 | do_install() { | ||
23 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
24 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
25 | distutils_do_install | ||
26 | install -d ${D}${datadir}/doc/${PN}/html/ | ||
27 | install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/ | ||
28 | install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/ | ||
29 | |||
30 | } | ||
diff --git a/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/meta-extras/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-extras/packages/python/python-native-2.5.1/catchup-with-swig.patch b/meta-extras/packages/python/python-native-2.5.1/catchup-with-swig.patch deleted file mode 100644 index f049b759f4..0000000000 --- a/meta-extras/packages/python/python-native-2.5.1/catchup-with-swig.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: 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-extras/packages/python/python-native-2.5.1/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch deleted file mode 100644 index 3356c1abbe..0000000000 --- a/meta-extras/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-extras/packages/python/python-native-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch deleted file mode 100644 index 6beeb6e022..0000000000 --- a/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: 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-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch b/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd62..0000000000 --- a/meta-extras/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-extras/packages/python/python-native-2.5.1/fix-staging.patch b/meta-extras/packages/python/python-native-2.5.1/fix-staging.patch deleted file mode 100644 index 087c813fd4..0000000000 --- a/meta-extras/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-extras/packages/python/python-native-2.5.2/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/meta-extras/packages/python/python-native-2.5.2/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-extras/packages/python/python-native-2.5.2/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch deleted file mode 100644 index 3356c1abbe..0000000000 --- a/meta-extras/packages/python/python-native-2.5.2/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-extras/packages/python/python-native-2.5.2/default-is-optimized.patch b/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch deleted file mode 100644 index 6beeb6e022..0000000000 --- a/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: 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-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch b/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd62..0000000000 --- a/meta-extras/packages/python/python-native-2.5.2/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-extras/packages/python/python-native_2.5.1.bb b/meta-extras/packages/python/python-native_2.5.1.bb deleted file mode 100644 index 21e5c7999f..0000000000 --- a/meta-extras/packages/python/python-native_2.5.1.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | DESCRIPTION = "The Python Programming Language" | ||
2 | HOMEPAGE = "http://www.python.org" | ||
3 | LICENSE = "PSF" | ||
4 | SECTION = "devel/python" | ||
5 | PRIORITY = "optional" | ||
6 | DEPENDS = "" | ||
7 | PR = "ml3" | ||
8 | |||
9 | EXCLUDE_FROM_WORLD = "1" | ||
10 | |||
11 | SRC_URI = "\ | ||
12 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | ||
13 | file://bindir-libdir.patch;patch=1 \ | ||
14 | file://cross-distutils.patch;patch=1 \ | ||
15 | file://dont-modify-shebang-line.patch;patch=1 \ | ||
16 | file://default-is-optimized.patch;patch=1 \ | ||
17 | file://catchup-with-swig.patch;patch=1 \ | ||
18 | file://fix-staging.patch;patch=1 \ | ||
19 | " | ||
20 | S = "${WORKDIR}/Python-${PV}" | ||
21 | |||
22 | inherit autotools native | ||
23 | |||
24 | prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" | ||
25 | exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" | ||
26 | |||
27 | EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ | ||
28 | --without-cxx --with-signal-module --with-wctype-functions" | ||
29 | EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
30 | STAGING_INCDIR=${STAGING_INCDIR}' | ||
31 | |||
32 | do_stage_append() { | ||
33 | install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ | ||
34 | } | ||
diff --git a/meta-extras/packages/python/python-pycairo_1.4.0.bb b/meta-extras/packages/python/python-pycairo_1.4.0.bb deleted file mode 100644 index 9bb2fdfcd8..0000000000 --- a/meta-extras/packages/python/python-pycairo_1.4.0.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | DESCRIPTION = "Python Bindings for the Cairo canvas library" | ||
2 | SECTION = "python-devel" | ||
3 | HOMEPAGE = "http://cairographics.org/pycairo" | ||
4 | LICENSE = "LGPL MPL" | ||
5 | DEPENDS = "cairo" | ||
6 | PR = "ml1" | ||
7 | |||
8 | SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz" | ||
9 | S = "${WORKDIR}/pycairo-${PV}" | ||
10 | |||
11 | inherit distutils pkgconfig | ||
12 | |||
13 | do_stage() { | ||
14 | install -d ${STAGING_INCDIR} | ||
15 | install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} | ||
16 | |||
17 | # nasty pkgconfig fix necessary here | ||
18 | sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc | ||
19 | } | ||
diff --git a/meta-extras/packages/python/python-pygobject-native_2.12.3.bb b/meta-extras/packages/python/python-pygobject-native_2.12.3.bb deleted file mode 100644 index cb879fdeb1..0000000000 --- a/meta-extras/packages/python/python-pygobject-native_2.12.3.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require python-pygobject_${PV}.bb | ||
2 | |||
3 | DEPENDS = "python-native glib-2.0-native" | ||
4 | |||
5 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 " | ||
6 | |||
7 | inherit native | ||
diff --git a/meta-extras/packages/python/python-pygobject/python-path.patch b/meta-extras/packages/python/python-pygobject/python-path.patch deleted file mode 100644 index 2ab7bdce6e..0000000000 --- a/meta-extras/packages/python/python-pygobject/python-path.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: pygobject-2.12.3/m4/python.m4 | ||
2 | =================================================================== | ||
3 | --- pygobject-2.12.3.orig/m4/python.m4 2007-03-02 15:00:20.945635455 +0100 | ||
4 | +++ pygobject-2.12.3/m4/python.m4 2007-03-02 15:00:43.532189734 +0100 | ||
5 | @@ -43,12 +43,18 @@ | ||
6 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
7 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
8 | dnl deduce PYTHON_INCLUDES | ||
9 | +AC_ARG_WITH(python-includes, | ||
10 | + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
11 | +if test x$py_exec_prefix != x; then | ||
12 | +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
13 | +else | ||
14 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
15 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
16 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
17 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
18 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
19 | fi | ||
20 | +fi | ||
21 | AC_SUBST(PYTHON_INCLUDES) | ||
22 | dnl check if the headers exist: | ||
23 | save_CPPFLAGS="$CPPFLAGS" | ||
diff --git a/meta-extras/packages/python/python-pygobject_2.12.3.bb b/meta-extras/packages/python/python-pygobject_2.12.3.bb deleted file mode 100644 index bfd04d569d..0000000000 --- a/meta-extras/packages/python/python-pygobject_2.12.3.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | DESCRIPTION = "Python GObject bindings" | ||
2 | SECTION = "devel/python" | ||
3 | LICENSE = "LGPL" | ||
4 | DEPENDS = "python-pygobject-native" | ||
5 | PR = "r3" | ||
6 | |||
7 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \ | ||
8 | file://python-path.patch;patch=1" | ||
9 | S = "${WORKDIR}/pygobject-${PV}" | ||
10 | |||
11 | inherit autotools distutils-base pkgconfig | ||
12 | |||
13 | EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" | ||
14 | |||
15 | do_stage() { | ||
16 | autotools_stage_all | ||
17 | install -d ${STAGING_LIBDIR}/../share/pygobject/ | ||
18 | cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ | ||
19 | install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
20 | cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
21 | } | ||
22 | |||
23 | FILES_${PN} = "${libdir}/python*" | ||
24 | FILES_${PN}-dev += "${datadir}/pygobject/xsl" | ||
diff --git a/meta-extras/packages/python/python-pygtk/acinclude.m4 b/meta-extras/packages/python/python-pygtk/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta-extras/packages/python/python-pygtk/acinclude.m4 +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | ## this one is commonly used with AM_PATH_PYTHONDIR ... | ||
2 | dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) | ||
3 | dnl Check if a module containing a given symbol is visible to python. | ||
4 | AC_DEFUN(AM_CHECK_PYMOD, | ||
5 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
6 | py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` | ||
7 | AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) | ||
8 | AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ | ||
9 | ifelse([$2],[], [prog=" | ||
10 | import sys | ||
11 | try: | ||
12 | import $1 | ||
13 | except ImportError: | ||
14 | sys.exit(1) | ||
15 | except: | ||
16 | sys.exit(0) | ||
17 | sys.exit(0)"], [prog=" | ||
18 | import $1 | ||
19 | $1.$2"]) | ||
20 | if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC | ||
21 | then | ||
22 | eval "py_cv_mod_$py_mod_var=yes" | ||
23 | else | ||
24 | eval "py_cv_mod_$py_mod_var=no" | ||
25 | fi | ||
26 | ]) | ||
27 | py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` | ||
28 | if test "x$py_val" != xno; then | ||
29 | AC_MSG_RESULT(yes) | ||
30 | ifelse([$3], [],, [$3 | ||
31 | ])dnl | ||
32 | else | ||
33 | AC_MSG_RESULT(no) | ||
34 | ifelse([$4], [],, [$4 | ||
35 | ])dnl | ||
36 | fi | ||
37 | ]) | ||
38 | |||
39 | dnl a macro to check for ability to create python extensions | ||
40 | dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) | ||
41 | dnl function also defines PYTHON_INCLUDES | ||
42 | AC_DEFUN([AM_CHECK_PYTHON_HEADERS], | ||
43 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
44 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
45 | dnl deduce PYTHON_INCLUDES | ||
46 | AC_ARG_WITH(python-includes, | ||
47 | [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
48 | if test x$py_exec_prefix != x; then | ||
49 | PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
50 | else | ||
51 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
52 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
53 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
54 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
55 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
56 | fi | ||
57 | fi | ||
58 | AC_SUBST(PYTHON_INCLUDES) | ||
59 | dnl check if the headers exist: | ||
60 | save_CPPFLAGS="$CPPFLAGS" | ||
61 | CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" | ||
62 | AC_TRY_CPP([#include <Python.h>],dnl | ||
63 | [AC_MSG_RESULT(found) | ||
64 | $1],dnl | ||
65 | [AC_MSG_RESULT(not found) | ||
66 | $2]) | ||
67 | CPPFLAGS="$save_CPPFLAGS" | ||
68 | ]) | ||
69 | |||
70 | dnl | ||
71 | dnl JH_ADD_CFLAG(FLAG) | ||
72 | dnl checks whether the C compiler supports the given flag, and if so, adds | ||
73 | dnl it to $CFLAGS. If the flag is already present in the list, then the | ||
74 | dnl check is not performed. | ||
75 | AC_DEFUN([JH_ADD_CFLAG], | ||
76 | [ | ||
77 | case " $CFLAGS " in | ||
78 | *@<:@\ \ @:>@$1@<:@\ \ @:>@*) | ||
79 | ;; | ||
80 | *) | ||
81 | save_CFLAGS="$CFLAGS" | ||
82 | CFLAGS="$CFLAGS $1" | ||
83 | AC_MSG_CHECKING([whether [$]CC understands $1]) | ||
84 | AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) | ||
85 | AC_MSG_RESULT($jh_has_option) | ||
86 | if test $jh_has_option = no; then | ||
87 | CFLAGS="$save_CFLAGS" | ||
88 | fi | ||
89 | ;; | ||
90 | esac]) | ||
diff --git a/meta-extras/packages/python/python-pygtk/fix-gtkunixprint.patch b/meta-extras/packages/python/python-pygtk/fix-gtkunixprint.patch deleted file mode 100644 index dca19ce5ed..0000000000 --- a/meta-extras/packages/python/python-pygtk/fix-gtkunixprint.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Index: pygtk-2.10.0/gtk/gtkunixprint.override | ||
2 | =================================================================== | ||
3 | --- pygtk-2.10.0.orig/gtk/gtkunixprint.override | ||
4 | +++ pygtk-2.10.0/gtk/gtkunixprint.override | ||
5 | @@ -105,11 +105,7 @@ _wrap_gtk_print_job_get_surface(PyGObjec | ||
6 | if (pyg_error_check(&error)) | ||
7 | return NULL; | ||
8 | |||
9 | -#if PYCAIRO_VERSION_HEX >= 0x1010600 | ||
10 | return PycairoSurface_FromSurface(surface, NULL); | ||
11 | -#else | ||
12 | - return PycairoSurface_FromSurface(surface, NULL, NULL); | ||
13 | -#endif | ||
14 | } | ||
15 | %% | ||
16 | override gtk_print_job_send kwargs | ||
diff --git a/meta-extras/packages/python/python-pygtk/nodocs.patch b/meta-extras/packages/python/python-pygtk/nodocs.patch deleted file mode 100644 index 9b2387e959..0000000000 --- a/meta-extras/packages/python/python-pygtk/nodocs.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: pygtk-2.10.4/Makefile.am | ||
2 | =================================================================== | ||
3 | --- pygtk-2.10.4.orig/Makefile.am | ||
4 | +++ pygtk-2.10.4/Makefile.am | ||
5 | @@ -4,7 +4,7 @@ if BUILD_GTK | ||
6 | GTK_SUBDIR = gtk | ||
7 | endif | ||
8 | |||
9 | -SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs | ||
10 | +SUBDIRS = codegen . $(GTK_SUBDIR) examples tests | ||
11 | |||
12 | PLATFORM_VERSION = 2.0 | ||
13 | |||
diff --git a/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch deleted file mode 100644 index 9340f8244d..0000000000 --- a/meta-extras/packages/python/python-pygtk/prevent_to_get_display_during_import.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: pygtk-2.10.4/gtk/__init__.py | ||
2 | =================================================================== | ||
3 | --- pygtk-2.10.4.orig/gtk/__init__.py 2007-11-27 19:27:05.000000000 -0300 | ||
4 | +++ pygtk-2.10.4/gtk/__init__.py 2007-11-27 19:28:22.000000000 -0300 | ||
5 | @@ -78,7 +78,8 @@ | ||
6 | |||
7 | keysyms = LazyModule('keysyms', locals()) | ||
8 | |||
9 | -_init() | ||
10 | +if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'): | ||
11 | + _init() | ||
12 | |||
13 | # CAPI | ||
14 | _PyGtk_API = _gtk._PyGtk_API | ||
diff --git a/meta-extras/packages/python/python-pygtk/python-pygtk2/acinclude.m4 b/meta-extras/packages/python/python-pygtk/python-pygtk2/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta-extras/packages/python/python-pygtk/python-pygtk2/acinclude.m4 +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | ## this one is commonly used with AM_PATH_PYTHONDIR ... | ||
2 | dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) | ||
3 | dnl Check if a module containing a given symbol is visible to python. | ||
4 | AC_DEFUN(AM_CHECK_PYMOD, | ||
5 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
6 | py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` | ||
7 | AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) | ||
8 | AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ | ||
9 | ifelse([$2],[], [prog=" | ||
10 | import sys | ||
11 | try: | ||
12 | import $1 | ||
13 | except ImportError: | ||
14 | sys.exit(1) | ||
15 | except: | ||
16 | sys.exit(0) | ||
17 | sys.exit(0)"], [prog=" | ||
18 | import $1 | ||
19 | $1.$2"]) | ||
20 | if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC | ||
21 | then | ||
22 | eval "py_cv_mod_$py_mod_var=yes" | ||
23 | else | ||
24 | eval "py_cv_mod_$py_mod_var=no" | ||
25 | fi | ||
26 | ]) | ||
27 | py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` | ||
28 | if test "x$py_val" != xno; then | ||
29 | AC_MSG_RESULT(yes) | ||
30 | ifelse([$3], [],, [$3 | ||
31 | ])dnl | ||
32 | else | ||
33 | AC_MSG_RESULT(no) | ||
34 | ifelse([$4], [],, [$4 | ||
35 | ])dnl | ||
36 | fi | ||
37 | ]) | ||
38 | |||
39 | dnl a macro to check for ability to create python extensions | ||
40 | dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) | ||
41 | dnl function also defines PYTHON_INCLUDES | ||
42 | AC_DEFUN([AM_CHECK_PYTHON_HEADERS], | ||
43 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
44 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
45 | dnl deduce PYTHON_INCLUDES | ||
46 | AC_ARG_WITH(python-includes, | ||
47 | [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
48 | if test x$py_exec_prefix != x; then | ||
49 | PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
50 | else | ||
51 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
52 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
53 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
54 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
55 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
56 | fi | ||
57 | fi | ||
58 | AC_SUBST(PYTHON_INCLUDES) | ||
59 | dnl check if the headers exist: | ||
60 | save_CPPFLAGS="$CPPFLAGS" | ||
61 | CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" | ||
62 | AC_TRY_CPP([#include <Python.h>],dnl | ||
63 | [AC_MSG_RESULT(found) | ||
64 | $1],dnl | ||
65 | [AC_MSG_RESULT(not found) | ||
66 | $2]) | ||
67 | CPPFLAGS="$save_CPPFLAGS" | ||
68 | ]) | ||
69 | |||
70 | dnl | ||
71 | dnl JH_ADD_CFLAG(FLAG) | ||
72 | dnl checks whether the C compiler supports the given flag, and if so, adds | ||
73 | dnl it to $CFLAGS. If the flag is already present in the list, then the | ||
74 | dnl check is not performed. | ||
75 | AC_DEFUN([JH_ADD_CFLAG], | ||
76 | [ | ||
77 | case " $CFLAGS " in | ||
78 | *@<:@\ \ @:>@$1@<:@\ \ @:>@*) | ||
79 | ;; | ||
80 | *) | ||
81 | save_CFLAGS="$CFLAGS" | ||
82 | CFLAGS="$CFLAGS $1" | ||
83 | AC_MSG_CHECKING([whether [$]CC understands $1]) | ||
84 | AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) | ||
85 | AC_MSG_RESULT($jh_has_option) | ||
86 | if test $jh_has_option = no; then | ||
87 | CFLAGS="$save_CFLAGS" | ||
88 | fi | ||
89 | ;; | ||
90 | esac]) | ||
diff --git a/meta-extras/packages/python/python-pygtk_2.10.4.bb b/meta-extras/packages/python/python-pygtk_2.10.4.bb deleted file mode 100644 index 6b26f59ad8..0000000000 --- a/meta-extras/packages/python/python-pygtk_2.10.4.bb +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | DESCRIPTION = "Python GTK+ 2.10.x Bindings" | ||
2 | SECTION = "devel/python" | ||
3 | # needs gtk+ 2.10.x | ||
4 | DEPENDS = "gtk+ libglade python-pycairo python-pygobject" | ||
5 | RDEPENDS = "python-shell python-pycairo python-pygobject" | ||
6 | PROVIDES = "python-pygtk2" | ||
7 | SRCNAME = "pygtk" | ||
8 | LICENSE = "LGPL" | ||
9 | PR = "ml8" | ||
10 | |||
11 | SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ | ||
12 | file://fix-gtkunixprint.patch;patch=1 \ | ||
13 | file://prevent_to_get_display_during_import.patch;patch=1 \ | ||
14 | file://nodocs.patch;patch=1 \ | ||
15 | file://acinclude.m4" | ||
16 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
17 | |||
18 | EXTRA_OECONF = "\ | ||
19 | --disable-docs \ | ||
20 | --with-python-includes=${STAGING_INCDIR}/../ \ | ||
21 | " | ||
22 | |||
23 | inherit autotools pkgconfig distutils-base | ||
24 | |||
25 | do_configure_prepend() { | ||
26 | install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ | ||
27 | } | ||
28 | |||
29 | # dirty fix #1: remove dependency on python-pygobject-dev | ||
30 | do_install_append() { | ||
31 | find ${D} -name "*.la"|xargs rm -f | ||
32 | rm -f ${D}/${bindir}/pygtk-codegen-2.0 | ||
33 | rm -rf ${D}/${libdir}/pkgconfig | ||
34 | } | ||
35 | |||
36 | # dirty fix #2: fix build system paths leaking in | ||
37 | require fix-path.inc | ||
38 | |||
39 | PACKAGES =+ "${PN}-demo" | ||
40 | FILES_${PN}-demo = "\ | ||
41 | ${bindir}/pygtk-demo \ | ||
42 | ${libdir}/pygtk \ | ||
43 | " | ||
44 | RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" | ||
45 | |||
46 | # todo: revamp packaging, package demo seperatly | ||
47 | FILES_${PN}-dev += "\ | ||
48 | ${libdir}/pygtk/2.0 \ | ||
49 | ${bindir}/pygtk-* \ | ||
50 | ${datadir}/pygtk/2.0" | ||
51 | |||
52 | do_stage() { | ||
53 | autotools_stage_includes | ||
54 | sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 | ||
55 | install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ | ||
56 | install -d ${STAGING_DATADIR}/pygtk/2.0/codegen | ||
57 | install -d ${STAGING_DATADIR}/pygtk/2.0/defs/ | ||
58 | cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/ | ||
59 | cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ | ||
60 | cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ | ||
61 | } | ||
diff --git a/meta-extras/packages/python/python-scons-native_0.97.bb b/meta-extras/packages/python/python-scons-native_0.97.bb deleted file mode 100644 index 45eeee117a..0000000000 --- a/meta-extras/packages/python/python-scons-native_0.97.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require python-scons_${PV}.bb | ||
2 | inherit native | ||
3 | DEPENDS = "python-native" | ||
4 | RDEPENDS = "" | ||
5 | |||
6 | do_stage() { | ||
7 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
8 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
9 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
10 | ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_LIBDIR}/.. --install-data=${STAGING_DATADIR} || \ | ||
11 | oefatal "python setup.py install execution failed." | ||
12 | } | ||
13 | |||
14 | do_install() { | ||
15 | : | ||
16 | } | ||
diff --git a/meta-extras/packages/python/python-scons_0.97.bb b/meta-extras/packages/python/python-scons_0.97.bb deleted file mode 100644 index dc5b40243e..0000000000 --- a/meta-extras/packages/python/python-scons_0.97.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | DESCRIPTION = "A Software Construction Tool" | ||
2 | SECTION = "devel/python" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "GPL" | ||
5 | SRCNAME = "scons" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" | ||
8 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
9 | |||
10 | inherit distutils | ||
diff --git a/meta-extras/packages/python/python_2.5.2.bb b/meta-extras/packages/python/python_2.5.2.bb deleted file mode 100644 index 1ac48f3686..0000000000 --- a/meta-extras/packages/python/python_2.5.2.bb +++ /dev/null | |||
@@ -1,105 +0,0 @@ | |||
1 | DESCRIPTION = "Python Programming Language" | ||
2 | HOMEPAGE = "http://www.python.org" | ||
3 | LICENSE = "PSF" | ||
4 | SECTION = "devel/python" | ||
5 | PRIORITY = "optional" | ||
6 | DEPENDS = "python-native readline zlib gdbm openssl sqlite3" | ||
7 | DEPENDS_sharprom = "python-native readline zlib gdbm openssl" | ||
8 | PR = "ml1" | ||
9 | |||
10 | PYTHON_MAJMIN = "2.5" | ||
11 | |||
12 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | ||
13 | file://bindir-libdir.patch;patch=1 \ | ||
14 | file://crosscompile.patch;patch=1 \ | ||
15 | file://fix-tkinter-detection.patch;patch=1 \ | ||
16 | file://autohell.patch;patch=1 \ | ||
17 | file://sitebranding.patch;patch=1 \ | ||
18 | file://enable-ctypes-module.patch;patch=1 \ | ||
19 | file://default-is-optimized.patch;patch=1 \ | ||
20 | file://sitecustomize.py" | ||
21 | S = "${WORKDIR}/Python-${PV}" | ||
22 | |||
23 | inherit autotools | ||
24 | |||
25 | EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ | ||
26 | --without-cxx --with-signal-module --with-wctype-functions \ | ||
27 | --enable-shared" | ||
28 | |||
29 | # | ||
30 | # copy config.h and an appropriate Makefile for distutils.sysconfig | ||
31 | # which laters uses the information out of these to compile extensions | ||
32 | # | ||
33 | do_compile_prepend() { | ||
34 | install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ | ||
35 | install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ | ||
36 | install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ | ||
37 | install -m 0644 Makefile Makefile.orig | ||
38 | install -m 0644 Makefile Makefile.backup | ||
39 | sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile | ||
40 | install -m 0644 Makefile Makefile.backup | ||
41 | sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile | ||
42 | install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ | ||
43 | } | ||
44 | |||
45 | do_compile() { | ||
46 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
47 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
48 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
49 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
50 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
51 | OPT="${CFLAGS}" libpython2.5.so | ||
52 | |||
53 | oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} | ||
54 | |||
55 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
56 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
57 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
58 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
59 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
60 | OPT="${CFLAGS}" | ||
61 | } | ||
62 | |||
63 | do_stage() { | ||
64 | install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ | ||
65 | oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} | ||
66 | } | ||
67 | |||
68 | do_install() { | ||
69 | install -m 0644 Makefile.orig Makefile | ||
70 | |||
71 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
72 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
73 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
74 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
75 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
76 | DESTDIR=${D} LIBDIR=${libdir} install | ||
77 | |||
78 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} | ||
79 | } | ||
80 | |||
81 | require python-${PYTHON_MAJMIN}-manifest.inc | ||
82 | |||
83 | # manual dependency additions | ||
84 | RPROVIDES_python-core = "python" | ||
85 | RRECOMMENDS_python-core = "python-readline" | ||
86 | RRECOMMENDS_python-crypt = "openssl" | ||
87 | |||
88 | # add sitecustomize | ||
89 | FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" | ||
90 | |||
91 | # package libpython | ||
92 | PACKAGES =+ "libpython2" | ||
93 | FILES_libpython2 = "${libdir}/libpython*" | ||
94 | |||
95 | # catch debug extensions | ||
96 | FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" | ||
97 | |||
98 | # catch all the rest (unsorted) | ||
99 | PACKAGES += "python-misc" | ||
100 | FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" | ||
101 | |||
102 | # catch manpage | ||
103 | PACKAGES += "python-man" | ||
104 | FILES_python-man = "${datadir}/man" | ||
105 | |||