summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/python
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-11-15 13:55:06 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-11-15 13:55:06 +0000
commit3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc (patch)
treed6731c1df8707972687bac18db0336599cfffe66 /meta-extras/packages/python
parenteaafa55d861b0a31e62895845730e778a0253ec9 (diff)
downloadpoky-3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc.tar.gz
python: update to 2.5.1 from OE (without tcl/tk deps)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3176 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/python')
-rw-r--r--meta-extras/packages/python/python-2.4.4/autohell.patch1209
-rw-r--r--meta-extras/packages/python/python-2.5-manifest.inc296
-rw-r--r--meta-extras/packages/python/python-2.5.1/autohell.patch49
-rw-r--r--meta-extras/packages/python/python-2.5.1/bindir-libdir.patch (renamed from meta-extras/packages/python/python-2.4.4/bindir-libdir.patch)8
-rw-r--r--meta-extras/packages/python/python-2.5.1/crosscompile.patch (renamed from meta-extras/packages/python/python-2.4.4/crosscompile.patch)44
-rw-r--r--meta-extras/packages/python/python-2.5.1/default-is-optimized.patch13
-rw-r--r--meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch (renamed from meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch)10
-rw-r--r--meta-extras/packages/python/python-2.5.1/sitebranding.patch (renamed from meta-extras/packages/python/python-2.4.4/sitebranding.patch)8
-rw-r--r--meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch (renamed from meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch)0
-rw-r--r--meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch (renamed from meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch)6
-rw-r--r--meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch13
-rw-r--r--meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch16
-rw-r--r--meta-extras/packages/python/python-native_2.5.1.bb34
-rw-r--r--meta-extras/packages/python/python_2.5.1.bb96
14 files changed, 558 insertions, 1244 deletions
diff --git a/meta-extras/packages/python/python-2.4.4/autohell.patch b/meta-extras/packages/python/python-2.4.4/autohell.patch
deleted file mode 100644
index b0eebb9ce8..0000000000
--- a/meta-extras/packages/python/python-2.4.4/autohell.patch
+++ /dev/null
@@ -1,1209 +0,0 @@
1--- Python-2.3.3/acinclude.m4 1969-12-31 19:00:00.000000000 -0500
2+++ Python-2.3.3/acinclude.m4 2004-02-17 12:22:29.000000000 -0500
3@@ -0,0 +1,10 @@
4+dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
5+dnl If this macro is not defined by Autoconf, define it here.
6+
7+m4_ifdef([AC_PROG_CXX_WORKS],
8+ [],
9+ [m4_define([AC_PROG_CXX_WORKS],
10+ [AC_LANG_PUSH(C++)dnl
11+ _AC_COMPILER_EXEEXT
12+ AC_LANG_POP()]
13+ )])
14--- Python-2.3.3/configure.in 2003-11-18 14:59:39.000000000 -0500
15+++ Python-2.3.3/configure.in 2004-02-17 12:22:27.000000000 -0500
16@@ -4,8 +4,8 @@
17 m4_define(PYTHON_VERSION, 2.3)
18
19 AC_REVISION($Revision: 1.427.4.10 $)
20-AC_PREREQ(2.53)
21-AC_INIT(python, PYTHON_VERSION)
22+AC_PREREQ(2.59)
23+AC_INIT([python],[PYTHON_VERSION])
24 AC_CONFIG_SRCDIR([Include/object.h])
25 AC_CONFIG_HEADER(pyconfig.h)
26
27@@ -58,7 +58,7 @@
28
29 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
30 AC_ARG_ENABLE(framework,
31- AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
32+ AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework),
33 [
34 case $enableval in
35 yes)
36@@ -92,8 +92,7 @@
37 AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
38
39 ##AC_ARG_WITH(dyld,
40-## AC_HELP_STRING(--with-dyld,
41-## Use (OpenStep|Rhapsody) dynamic linker))
42+## AS_HELP_STRING(--with-dyld,## Use (OpenStep|Rhapsody) dynamic linker))
43 ##
44 # Set name for machine-dependent library files
45 AC_SUBST(MACHDEP)
46@@ -227,7 +226,7 @@
47 # on that fiddles with OPT and BASECFLAGS?
48 AC_MSG_CHECKING(for --without-gcc)
49 AC_ARG_WITH(gcc,
50- AC_HELP_STRING(--without-gcc,never use gcc),
51+ AS_HELP_STRING(--without-gcc,never use gcc),
52 [
53 case $withval in
54 no) CC=cc
55@@ -273,7 +272,7 @@
56 MAINOBJ=python.o
57 AC_MSG_CHECKING(for --with-cxx=<compiler>)
58 AC_ARG_WITH(cxx,
59- AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support),
60+ AS_HELP_STRING(--with-cxx=<compiler>,enable C++ support),
61 [
62 check_cxx=no
63 case $withval in
64@@ -298,15 +297,6 @@
65 dnl --without-cxx was given.
66 dnl Finally, it does not test whether CXX is g++.
67
68-dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
69-ifdef([AC_PROG_CXX_WORKS],[],
70- [AC_DEFUN([AC_PROG_CXX_WORKS],
71- [AC_LANG_PUSH(C++)dnl
72- _AC_COMPILER_EXEEXT
73- AC_LANG_POP()
74- ]
75-)])
76-
77 if test "$check_cxx" = "yes"
78 then
79 AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
80@@ -348,7 +338,7 @@
81 AC_EXEEXT
82 AC_MSG_CHECKING(for --with-suffix)
83 AC_ARG_WITH(suffix,
84- AC_HELP_STRING(--with-suffix=.exe, set executable suffix),
85+ AS_HELP_STRING(--with-suffix=.exe,set executable suffix),
86 [
87 case $withval in
88 no) EXEEXT=;;
89@@ -474,7 +464,7 @@
90
91 AC_MSG_CHECKING(for --enable-shared)
92 AC_ARG_ENABLE(shared,
93- AC_HELP_STRING(--enable-shared, disable/enable building shared python library))
94+ AS_HELP_STRING(--enable-shared,disable/enable building shared python library))
95
96 if test -z "$enable_shared"
97 then
98@@ -583,7 +573,7 @@
99 # Check for --with-pydebug
100 AC_MSG_CHECKING(for --with-pydebug)
101 AC_ARG_WITH(pydebug,
102- AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined),
103+ AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined),
104 [
105 if test "$withval" != no
106 then
107@@ -660,10 +650,7 @@
108 AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing)
109 ac_save_cc="$CC"
110 CC="$CC -fno-strict-aliasing"
111- AC_TRY_RUN([int main() { return 0; }],
112- ac_cv_no_strict_aliasing_ok=yes,
113- ac_cv_no_strict_aliasing_ok=no,
114- ac_cv_no_strict_aliasing_ok=no)
115+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_no_strict_aliasing_ok=yes],[ac_cv_no_strict_aliasing_ok=no],[ac_cv_no_strict_aliasing_ok=no])
116 CC="$ac_save_cc"
117 AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok)
118 if test $ac_cv_no_strict_aliasing_ok = yes
119@@ -711,10 +698,7 @@
120 AC_CACHE_VAL(ac_cv_opt_olimit_ok,
121 [ac_save_cc="$CC"
122 CC="$CC -OPT:Olimit=0"
123-AC_TRY_RUN([int main() { return 0; }],
124- ac_cv_opt_olimit_ok=yes,
125- ac_cv_opt_olimit_ok=no,
126- ac_cv_opt_olimit_ok=no)
127+AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_opt_olimit_ok=yes],[ac_cv_opt_olimit_ok=no],[ac_cv_opt_olimit_ok=no])
128 CC="$ac_save_cc"])
129 AC_MSG_RESULT($ac_cv_opt_olimit_ok)
130 if test $ac_cv_opt_olimit_ok = yes; then
131@@ -733,10 +717,7 @@
132 AC_CACHE_VAL(ac_cv_olimit_ok,
133 [ac_save_cc="$CC"
134 CC="$CC -Olimit 1500"
135- AC_TRY_RUN([int main() { return 0; }],
136- ac_cv_olimit_ok=yes,
137- ac_cv_olimit_ok=no,
138- ac_cv_olimit_ok=no)
139+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_olimit_ok=yes],[ac_cv_olimit_ok=no],[ac_cv_olimit_ok=no])
140 CC="$ac_save_cc"])
141 AC_MSG_RESULT($ac_cv_olimit_ok)
142 if test $ac_cv_olimit_ok = yes; then
143@@ -751,7 +732,7 @@
144 # options before we can check whether -Kpthread improves anything.
145 AC_MSG_CHECKING(whether pthreads are available without options)
146 AC_CACHE_VAL(ac_cv_pthread_is_default,
147-[AC_TRY_RUN([
148+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
149 #include <pthread.h>
150
151 void* routine(void* p){return NULL;}
152@@ -763,14 +744,11 @@
153 (void)pthread_detach(p);
154 return 0;
155 }
156-],
157-[
158+]])],[
159 ac_cv_pthread_is_default=yes
160 ac_cv_kthread=no
161 ac_cv_pthread=no
162-],
163- ac_cv_pthread_is_default=no,
164- ac_cv_pthread_is_default=no)
165+],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no])
166 ])
167 AC_MSG_RESULT($ac_cv_pthread_is_default)
168
169@@ -788,7 +766,7 @@
170 AC_CACHE_VAL(ac_cv_kpthread,
171 [ac_save_cc="$CC"
172 CC="$CC -Kpthread"
173-AC_TRY_RUN([
174+AC_RUN_IFELSE([AC_LANG_SOURCE([[
175 #include <pthread.h>
176
177 void* routine(void* p){return NULL;}
178@@ -800,10 +778,7 @@
179 (void)pthread_detach(p);
180 return 0;
181 }
182-],
183- ac_cv_kpthread=yes,
184- ac_cv_kpthread=no,
185- ac_cv_kpthread=no)
186+]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no])
187 CC="$ac_save_cc"])
188 AC_MSG_RESULT($ac_cv_kpthread)
189 fi
190@@ -819,7 +794,7 @@
191 AC_CACHE_VAL(ac_cv_kthread,
192 [ac_save_cc="$CC"
193 CC="$CC -Kthread"
194-AC_TRY_RUN([
195+AC_RUN_IFELSE([AC_LANG_SOURCE([[
196 #include <pthread.h>
197
198 void* routine(void* p){return NULL;}
199@@ -831,10 +806,7 @@
200 (void)pthread_detach(p);
201 return 0;
202 }
203-],
204- ac_cv_kthread=yes,
205- ac_cv_kthread=no,
206- ac_cv_kthread=no)
207+]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no])
208 CC="$ac_save_cc"])
209 AC_MSG_RESULT($ac_cv_kthread)
210 fi
211@@ -850,7 +822,7 @@
212 AC_CACHE_VAL(ac_cv_thread,
213 [ac_save_cc="$CC"
214 CC="$CC -pthread"
215-AC_TRY_RUN([
216+AC_RUN_IFELSE([AC_LANG_SOURCE([[
217 #include <pthread.h>
218
219 void* routine(void* p){return NULL;}
220@@ -862,10 +834,7 @@
221 (void)pthread_detach(p);
222 return 0;
223 }
224-],
225- ac_cv_pthread=yes,
226- ac_cv_pthread=no,
227- ac_cv_pthread=no)
228+]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no])
229 CC="$ac_save_cc"])
230 AC_MSG_RESULT($ac_cv_pthread)
231 fi
232@@ -911,11 +880,11 @@
233
234 dnl # check for ANSI or K&R ("traditional") preprocessor
235 dnl AC_MSG_CHECKING(for C preprocessor type)
236-dnl AC_TRY_COMPILE([
237+dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
238 dnl #define spam(name, doc) {#name, &name, #name "() -- " doc}
239 dnl int foo;
240 dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something");
241-dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional)
242+dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional])
243 dnl AC_MSG_RESULT($cpp_type)
244
245 # checks for header files
246@@ -941,19 +910,13 @@
247
248 # Check whether using makedev requires defining _OSF_SOURCE
249 AC_MSG_CHECKING(for makedev)
250-AC_TRY_LINK([#include <sys/types.h> ],
251- [ makedev(0, 0) ],
252- ac_cv_has_makedev=yes,
253- ac_cv_has_makedev=no)
254+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
255 if test "$ac_cv_has_makedev" = "no"; then
256 # we didn't link, try if _OSF_SOURCE will allow us to link
257- AC_TRY_LINK([
258+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
259 #define _OSF_SOURCE 1
260 #include <sys/types.h>
261- ],
262- [ makedev(0, 0) ],
263- ac_cv_has_makedev=yes,
264- ac_cv_has_makedev=no)
265+ ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
266 if test "$ac_cv_has_makedev" = "yes"; then
267 AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.])
268 fi
269@@ -972,11 +935,11 @@
270
271 use_lfs=yes
272 AC_MSG_CHECKING(Solaris LFS bug)
273-AC_TRY_COMPILE([
274+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
275 #define _LARGEFILE_SOURCE 1
276 #define _FILE_OFFSET_BITS 64
277 #include <sys/resource.h>
278-],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes)
279+]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes])
280 AC_MSG_RESULT($sol_lfs_bug)
281 if test "$sol_lfs_bug" = "yes"; then
282 use_lfs=no
283@@ -1018,10 +981,10 @@
284
285 AC_MSG_CHECKING(for long long support)
286 have_long_long=no
287-AC_TRY_COMPILE([], [long long x; x = (long long)0;], [
288+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[
289 AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
290 have_long_long=yes
291-])
292+],[])
293 AC_MSG_RESULT($have_long_long)
294 if test "$have_long_long" = yes ; then
295 AC_CHECK_SIZEOF(long long, 8)
296@@ -1029,10 +992,10 @@
297
298 AC_MSG_CHECKING(for uintptr_t support)
299 have_uintptr_t=no
300-AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [
301+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[
302 AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.])
303 have_uintptr_t=yes
304-])
305+],[])
306 AC_MSG_RESULT($have_uintptr_t)
307 if test "$have_uintptr_t" = yes ; then
308 AC_CHECK_SIZEOF(uintptr_t, 4)
309@@ -1041,7 +1004,7 @@
310 # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
311 AC_MSG_CHECKING(size of off_t)
312 AC_CACHE_VAL(ac_cv_sizeof_off_t,
313-[AC_TRY_RUN([#include <stdio.h>
314+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
315 #include <sys/types.h>
316 main()
317 {
318@@ -1049,10 +1012,7 @@
319 if (!f) exit(1);
320 fprintf(f, "%d\n", sizeof(off_t));
321 exit(0);
322-}],
323-ac_cv_sizeof_off_t=`cat conftestval`,
324-ac_cv_sizeof_off_t=0,
325-ac_cv_sizeof_off_t=4)
326+}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4])
327 ])
328 AC_MSG_RESULT($ac_cv_sizeof_off_t)
329 AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
330@@ -1075,7 +1035,7 @@
331 # AC_CHECK_SIZEOF() doesn't include <time.h>.
332 AC_MSG_CHECKING(size of time_t)
333 AC_CACHE_VAL(ac_cv_sizeof_time_t,
334-[AC_TRY_RUN([#include <stdio.h>
335+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
336 #include <time.h>
337 main()
338 {
339@@ -1083,10 +1043,7 @@
340 if (!f) exit(1);
341 fprintf(f, "%d\n", sizeof(time_t));
342 exit(0);
343-}],
344-ac_cv_sizeof_time_t=`cat conftestval`,
345-ac_cv_sizeof_time_t=0,
346-ac_cv_sizeof_time_t=4)
347+}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4])
348 ])
349 AC_MSG_RESULT($ac_cv_sizeof_time_t)
350 AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
351@@ -1104,13 +1061,13 @@
352 fi
353 AC_MSG_CHECKING(for pthread_t)
354 have_pthread_t=no
355-AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
356+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[])
357 AC_MSG_RESULT($have_pthread_t)
358 if test "$have_pthread_t" = yes ; then
359 # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
360 AC_MSG_CHECKING(size of pthread_t)
361 AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
362- [AC_TRY_RUN([#include <stdio.h>
363+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
364 #include <pthread.h>
365 main()
366 {
367@@ -1118,10 +1075,7 @@
368 if (!f) exit(1);
369 fprintf(f, "%d\n", sizeof(pthread_t));
370 exit(0);
371- }],
372- ac_cv_sizeof_pthread_t=`cat conftestval`,
373- ac_cv_sizeof_pthread_t=0,
374- ac_cv_sizeof_pthread_t=4)
375+ }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4])
376 ])
377 AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
378 AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
379@@ -1131,7 +1085,7 @@
380
381 AC_MSG_CHECKING(for --enable-toolbox-glue)
382 AC_ARG_ENABLE(toolbox-glue,
383- AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
384+ AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions))
385
386 if test -z "$enable_toolbox_glue"
387 then
388@@ -1436,13 +1390,10 @@
389 # checks for system dependent C++ extensions support
390 case "$ac_sys_system" in
391 AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support)
392- AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
393- [loadAndInit("", 0, "")],
394- [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
395+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
396 [Define for AIX if your compiler is a genuine IBM xlC/xlC_r
397 and you want support for AIX C++ shared extension modules.])
398- AC_MSG_RESULT(yes)],
399- [AC_MSG_RESULT(no)]);;
400+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);;
401 *) ;;
402 esac
403
404@@ -1464,7 +1415,7 @@
405
406 AC_MSG_CHECKING(for --with-libs)
407 AC_ARG_WITH(libs,
408- AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs),
409+ AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs),
410 [
411 AC_MSG_RESULT($withval)
412 LIBS="$withval $LIBS"
413@@ -1476,7 +1427,7 @@
414 AC_SUBST(SIGNAL_OBJS)
415 AC_MSG_CHECKING(for --with-signal-module)
416 AC_ARG_WITH(signal-module,
417- AC_HELP_STRING(--with-signal-module, disable/enable signal module))
418+ AS_HELP_STRING(--with-signal-module,disable/enable signal module))
419
420 if test -z "$with_signal_module"
421 then with_signal_module="yes"
422@@ -1498,7 +1449,7 @@
423 AC_MSG_CHECKING(for --with-dec-threads)
424 AC_SUBST(LDLAST)
425 AC_ARG_WITH(dec-threads,
426- AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries),
427+ AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries),
428 [
429 AC_MSG_RESULT($withval)
430 LDLAST=-threads
431@@ -1518,12 +1469,12 @@
432 AC_MSG_CHECKING(for --with-threads)
433 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
434 AC_ARG_WITH(threads,
435- AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support))
436+ AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support))
437
438 # --with-thread is deprecated, but check for it anyway
439 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
440 AC_ARG_WITH(thread,
441- AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads),
442+ AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads),
443 [with_threads=$with_thread])
444
445 if test -z "$with_threads"
446@@ -1603,7 +1554,7 @@
447 THREADOBJ="Python/thread.o"],[
448 AC_MSG_CHECKING(for --with-pth)
449 AC_ARG_WITH([pth],
450- AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
451+ AS_HELP_STRING(--with-pth,use GNU pth threading libraries),
452 [AC_MSG_RESULT($withval)
453 AC_DEFINE([WITH_THREAD])
454 AC_DEFINE([HAVE_PTH], 1,
455@@ -1618,10 +1569,10 @@
456 _libs=$LIBS
457 LIBS="$LIBS -lpthread"
458 AC_MSG_CHECKING([for pthread_create in -lpthread])
459- AC_TRY_LINK([#include <pthread.h>
460+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
461
462-void * start_routine (void *arg) { exit (0); }], [
463-pthread_create (NULL, NULL, start_routine, NULL)], [
464+void * start_routine (void *arg) { exit (0); }]], [[
465+pthread_create (NULL, NULL, start_routine, NULL)]])],[
466 AC_MSG_RESULT(yes)
467 AC_DEFINE(WITH_THREAD)
468 posix_threads=yes
469@@ -1705,7 +1656,7 @@
470
471 AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
472 AC_CACHE_VAL(ac_cv_pthread_system_supported,
473- [AC_TRY_RUN([#include <pthread.h>
474+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
475 void *foo(void *parm) {
476 return NULL;
477 }
478@@ -1716,10 +1667,7 @@
479 if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
480 if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
481 exit(0);
482- }],
483- ac_cv_pthread_system_supported=yes,
484- ac_cv_pthread_system_supported=no,
485- ac_cv_pthread_system_supported=no)
486+ }]])],[ac_cv_pthread_system_supported=yes],[ac_cv_pthread_system_supported=no],[ac_cv_pthread_system_supported=no])
487 ])
488 AC_MSG_RESULT($ac_cv_pthread_system_supported)
489 if test "$ac_cv_pthread_system_supported" = "yes"; then
490@@ -1754,7 +1702,7 @@
491
492 [
493 dnl the check does not work on cross compilation case...
494- AC_TRY_RUN([ /* AF_INET6 available check */
495+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */
496 #include <sys/types.h>
497 #include <sys/socket.h>
498 main()
499@@ -1764,25 +1712,19 @@
500 else
501 exit(0);
502 }
503-],
504- AC_MSG_RESULT(yes)
505- ipv6=yes,
506- AC_MSG_RESULT(no)
507- ipv6=no,
508- AC_MSG_RESULT(no)
509+]])],[AC_MSG_RESULT(yes)
510+ ipv6=yes],[AC_MSG_RESULT(no)
511+ ipv6=no],[AC_MSG_RESULT(no)
512 ipv6=no
513-)
514+])
515
516 if test "$ipv6" = "yes"; then
517 AC_MSG_CHECKING(if RFC2553 API is available)
518- AC_TRY_COMPILE([#include <sys/types.h>
519-#include <netinet/in.h>],
520- [struct sockaddr_in6 x;
521-x.sin6_scope_id;],
522- AC_MSG_RESULT(yes)
523- ipv6=yes,
524- AC_MSG_RESULT(no, IPv6 disabled)
525- ipv6=no)
526+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
527+#include <netinet/in.h>]], [[struct sockaddr_in6 x;
528+x.sin6_scope_id;]])],[AC_MSG_RESULT(yes)
529+ ipv6=yes],[AC_MSG_RESULT(no, IPv6 disabled)
530+ ipv6=no])
531 fi
532
533 if test "$ipv6" = "yes"; then
534@@ -1905,7 +1847,7 @@
535 # Check for universal newline support
536 AC_MSG_CHECKING(for --with-universal-newlines)
537 AC_ARG_WITH(universal-newlines,
538- AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines))
539+ AS_HELP_STRING(--with(out)-universal-newlines,disable/enable foreign newlines))
540
541 if test -z "$with_universal_newlines"
542 then with_universal_newlines="yes"
543@@ -1923,7 +1865,7 @@
544 # Check for --with-doc-strings
545 AC_MSG_CHECKING(for --with-doc-strings)
546 AC_ARG_WITH(doc-strings,
547- AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings))
548+ AS_HELP_STRING(--with(out)-doc-strings,disable/enable documentation strings))
549
550 if test -z "$with_doc_strings"
551 then with_doc_strings="yes"
552@@ -1938,7 +1880,7 @@
553 # Check for Python-specific malloc support
554 AC_MSG_CHECKING(for --with-pymalloc)
555 AC_ARG_WITH(pymalloc,
556- AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs))
557+ AS_HELP_STRING(--with(out)-pymalloc,disable/enable specialized mallocs))
558
559 if test -z "$with_pymalloc"
560 then with_pymalloc="yes"
561@@ -1953,7 +1895,7 @@
562 # Check for --with-wctype-functions
563 AC_MSG_CHECKING(for --with-wctype-functions)
564 AC_ARG_WITH(wctype-functions,
565- AC_HELP_STRING(--with-wctype-functions, use wctype.h functions),
566+ AS_HELP_STRING(--with-wctype-functions,use wctype.h functions),
567 [
568 if test "$withval" != no
569 then
570@@ -1971,7 +1913,7 @@
571
572 AC_MSG_CHECKING(for --with-sgi-dl)
573 AC_ARG_WITH(sgi-dl,
574- AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
575+ AS_HELP_STRING(--with-sgi-dl=DIRECTORY,IRIX 4 dynamic linking),
576 [
577 AC_MSG_RESULT($withval)
578 echo --with-sgi-dl is unsupported, see README
579@@ -1993,7 +1935,7 @@
580
581 AC_MSG_CHECKING(for --with-dl-dld)
582 AC_ARG_WITH(dl-dld,
583- AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
584+ AS_HELP_STRING(--with-dl-dld=DL_DIR,GNU dynamic linking),
585 [
586 AC_MSG_RESULT($withval)
587 echo --with-dl-dld is unsupported, see README
588@@ -2085,41 +2027,29 @@
589 # For some functions, having a definition is not sufficient, since
590 # we want to take their address.
591 AC_MSG_CHECKING(for chroot)
592-AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot,
593- AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
594- AC_MSG_RESULT(yes),
595- AC_MSG_RESULT(no)
596-)
597+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=chroot]])],[AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
598+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
599+])
600 AC_MSG_CHECKING(for link)
601-AC_TRY_COMPILE([#include <unistd.h>], void *x=link,
602- AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
603- AC_MSG_RESULT(yes),
604- AC_MSG_RESULT(no)
605-)
606+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=link]])],[AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
607+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
608+])
609 AC_MSG_CHECKING(for symlink)
610-AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink,
611- AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
612- AC_MSG_RESULT(yes),
613- AC_MSG_RESULT(no)
614-)
615+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=symlink]])],[AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
616+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
617+])
618 AC_MSG_CHECKING(for fchdir)
619-AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir,
620- AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
621- AC_MSG_RESULT(yes),
622- AC_MSG_RESULT(no)
623-)
624+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fchdir]])],[AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
625+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
626+])
627 AC_MSG_CHECKING(for fsync)
628-AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync,
629- AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
630- AC_MSG_RESULT(yes),
631- AC_MSG_RESULT(no)
632-)
633+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fsync]])],[AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
634+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
635+])
636 AC_MSG_CHECKING(for fdatasync)
637-AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync,
638- AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
639- AC_MSG_RESULT(yes),
640- AC_MSG_RESULT(no)
641-)
642+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fdatasync]])],[AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
643+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
644+])
645
646 # On some systems (eg. FreeBSD 5), we would find a definition of the
647 # functions ctermid_r, setgroups in the library, but no prototype
648@@ -2128,34 +2058,28 @@
649 # because of the missing prototypes.
650
651 AC_MSG_CHECKING(for ctermid_r)
652-AC_TRY_COMPILE([
653+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
654 #include "confdefs.h"
655 #include <stdio.h>
656-], void* p = ctermid_r,
657- AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
658- AC_MSG_RESULT(yes),
659- AC_MSG_RESULT(no)
660-)
661+]], [[void* p = ctermid_r]])],[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
662+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
663+])
664
665 AC_MSG_CHECKING(for flock)
666-AC_TRY_COMPILE([
667+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
668 #include "confdefs.h"
669 #include <sys/file.h>
670-], void* p = flock,
671- AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
672- AC_MSG_RESULT(yes),
673- AC_MSG_RESULT(no)
674-)
675+]], [[void* p = flock]])],[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
676+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
677+])
678
679 AC_MSG_CHECKING(for getpagesize)
680-AC_TRY_COMPILE([
681+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
682 #include "confdefs.h"
683 #include <unistd.h>
684-], void* p = getpagesize,
685- AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
686- AC_MSG_RESULT(yes),
687- AC_MSG_RESULT(no)
688-)
689+]], [[void* p = getpagesize]])],[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
690+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
691+])
692
693 dnl check for true
694 AC_CHECK_PROGS(TRUE, true, /bin/true)
695@@ -2167,54 +2091,45 @@
696 )
697
698 AC_MSG_CHECKING(for hstrerror)
699-AC_TRY_LINK([
700+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
701 #include "confdefs.h"
702 #include <netdb.h>
703-], void* p = hstrerror; hstrerror(0),
704- AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
705- AC_MSG_RESULT(yes),
706- AC_MSG_RESULT(no)
707-)
708+]], [[void* p = hstrerror; hstrerror(0)]])],[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
709+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
710+])
711
712 AC_MSG_CHECKING(for inet_aton)
713-AC_TRY_LINK([
714+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
715 #include "confdefs.h"
716 #include <sys/socket.h>
717 #include <netinet/in.h>
718 #include <arpa/inet.h>
719-], void* p = inet_aton;inet_aton(0,0),
720- AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
721- AC_MSG_RESULT(yes),
722- AC_MSG_RESULT(no)
723-)
724+]], [[void* p = inet_aton;inet_aton(0,0)]])],[AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
725+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
726+])
727
728 AC_MSG_CHECKING(for inet_pton)
729-AC_TRY_COMPILE([
730+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
731 #include "confdefs.h"
732 #include <sys/types.h>
733 #include <sys/socket.h>
734 #include <netinet/in.h>
735 #include <arpa/inet.h>
736-], void* p = inet_pton,
737- AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
738- AC_MSG_RESULT(yes),
739- AC_MSG_RESULT(no)
740-)
741+]], [[void* p = inet_pton]])],[AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
742+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
743+])
744
745 # On some systems, setgroups is in unistd.h, on others, in grp.h
746 AC_MSG_CHECKING(for setgroups)
747-AC_TRY_COMPILE([
748+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
749 #include "confdefs.h"
750 #include <unistd.h>
751 #ifdef HAVE_GRP_H
752 #include <grp.h>
753 #endif
754-],
755-void* p = setgroups,
756- AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
757- AC_MSG_RESULT(yes),
758- AC_MSG_RESULT(no)
759-)
760+]], [[void* p = setgroups]])],[AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
761+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
762+])
763
764 # check for openpty and forkpty
765
766@@ -2226,30 +2141,24 @@
767
768 AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove)
769 AC_CHECK_FUNCS(getpgrp,
770- AC_TRY_COMPILE([#include <unistd.h>],
771- [getpgrp(0);],
772- AC_DEFINE(GETPGRP_HAVE_ARG, 1,
773- [Define if getpgrp() must be called as getpgrp(0).])
774- )
775+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[getpgrp(0);]])],[AC_DEFINE(GETPGRP_HAVE_ARG, 1,
776+ Define if getpgrp() must be called as getpgrp(0).)
777+ ],[])
778 )
779 AC_CHECK_FUNCS(setpgrp,
780- AC_TRY_COMPILE([#include <unistd.h>],
781- [setpgrp(0,0);],
782- AC_DEFINE(SETPGRP_HAVE_ARG, 1,
783- [Define if setpgrp() must be called as setpgrp(0, 0).])
784- )
785+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_HAVE_ARG, 1,
786+ Define if setpgrp() must be called as setpgrp(0, 0).)
787+ ],[])
788 )
789 AC_CHECK_FUNCS(gettimeofday,
790- AC_TRY_COMPILE([#include <sys/time.h>],
791- [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,
792- AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
793- [Define if gettimeofday() does not have second (timezone) argument
794- This is the case on Motorola V4 (R40V4.2)])
795- )
796+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],[],[AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
797+ Define if gettimeofday() does not have second (timezone) argument
798+ This is the case on Motorola V4 (R40V4.2))
799+ ])
800 )
801
802 AC_MSG_CHECKING(for major, minor, and makedev)
803-AC_TRY_LINK([
804+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
805 #if defined(MAJOR_IN_MKDEV)
806 #include <sys/mkdev.h>
807 #elif defined(MAJOR_IN_SYSMACROS)
808@@ -2257,9 +2166,9 @@
809 #else
810 #include <sys/types.h>
811 #endif
812-],[
813+]], [[
814 makedev(major(0),minor(0));
815-],[
816+]])],[
817 AC_DEFINE(HAVE_DEVICE_MACROS, 1,
818 [Define to 1 if you have the device macros.])
819 AC_MSG_RESULT(yes)
820@@ -2270,14 +2179,14 @@
821 # On OSF/1 V5.1, getaddrinfo is available, but a define
822 # for [no]getaddrinfo in netdb.h.
823 AC_MSG_CHECKING(for getaddrinfo)
824-AC_TRY_LINK([
825+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
826 #include <sys/types.h>
827 #include <sys/socket.h>
828 #include <netdb.h>
829 #include <stdio.h>
830-],[
831+]], [[
832 getaddrinfo(NULL, NULL, NULL, NULL);
833-], [
834+]])],[
835 AC_MSG_RESULT(yes)
836 AC_MSG_CHECKING(getaddrinfo bug)
837 AC_TRY_RUN([
838@@ -2371,7 +2280,7 @@
839 AC_MSG_RESULT(buggy)
840 buggygetaddrinfo=yes,
841 AC_MSG_RESULT(buggy)
842-buggygetaddrinfo=yes)], [
843+buggygetaddrinfo=yes)],[
844 AC_MSG_RESULT(no)
845 buggygetaddrinfo=yes
846 ])
847@@ -2397,9 +2306,7 @@
848
849 AC_MSG_CHECKING(for time.h that defines altzone)
850 AC_CACHE_VAL(ac_cv_header_time_altzone,
851-[AC_TRY_COMPILE([#include <time.h>], [return altzone;],
852- ac_cv_header_time_altzone=yes,
853- ac_cv_header_time_altzone=no)])
854+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],[ac_cv_header_time_altzone=yes],[ac_cv_header_time_altzone=no])])
855 AC_MSG_RESULT($ac_cv_header_time_altzone)
856 if test $ac_cv_header_time_altzone = yes; then
857 AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.])
858@@ -2407,25 +2314,22 @@
859
860 was_it_defined=no
861 AC_MSG_CHECKING(whether sys/select.h and sys/time.h may both be included)
862-AC_TRY_COMPILE([
863+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
864 #include <sys/types.h>
865 #include <sys/select.h>
866 #include <sys/time.h>
867-], [;], [
868+]], [[;]])],[
869 AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1,
870 [Define if you can safely include both <sys/select.h> and <sys/time.h>
871 (which you can't on SCO ODT 3.0).])
872 was_it_defined=yes
873-])
874+],[])
875 AC_MSG_RESULT($was_it_defined)
876
877 AC_MSG_CHECKING(for addrinfo)
878 AC_CACHE_VAL(ac_cv_struct_addrinfo,
879-AC_TRY_COMPILE([
880-# include <netdb.h>],
881- [struct addrinfo a],
882- ac_cv_struct_addrinfo=yes,
883- ac_cv_struct_addrinfo=no))
884+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
885+# include <netdb.h>]], [[struct addrinfo a]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no]))
886 AC_MSG_RESULT($ac_cv_struct_addrinfo)
887 if test $ac_cv_struct_addrinfo = yes; then
888 AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
889@@ -2433,12 +2337,9 @@
890
891 AC_MSG_CHECKING(for sockaddr_storage)
892 AC_CACHE_VAL(ac_cv_struct_sockaddr_storage,
893-AC_TRY_COMPILE([
894+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
895 # include <sys/types.h>
896-# include <sys/socket.h>],
897- [struct sockaddr_storage s],
898- ac_cv_struct_sockaddr_storage=yes,
899- ac_cv_struct_sockaddr_storage=no))
900+# include <sys/socket.h>]], [[struct sockaddr_storage s]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no]))
901 AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
902 if test $ac_cv_struct_sockaddr_storage = yes; then
903 AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)])
904@@ -2451,30 +2352,28 @@
905
906 works=no
907 AC_MSG_CHECKING(for working volatile)
908-AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes,
909- AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.])
910-)
911+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[volatile int x; x = 0;]])],[works=yes],[AC_DEFINE(volatile, , Define to empty if the keyword does not work.)
912+])
913 AC_MSG_RESULT($works)
914
915 works=no
916 AC_MSG_CHECKING(for working signed char)
917-AC_TRY_COMPILE([], [signed char c;], works=yes,
918- AC_DEFINE(signed, [], [Define to empty if the keyword does not work.])
919-)
920+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])],[works=yes],[AC_DEFINE(signed, , Define to empty if the keyword does not work.)
921+])
922 AC_MSG_RESULT($works)
923
924 have_prototypes=no
925 AC_MSG_CHECKING(for prototypes)
926-AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[
927+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])],[
928 AC_DEFINE(HAVE_PROTOTYPES, 1,
929 [Define if your compiler supports function prototype])
930 have_prototypes=yes
931-])
932+],[])
933 AC_MSG_RESULT($have_prototypes)
934
935 works=no
936 AC_MSG_CHECKING(for variable length prototypes and stdarg.h)
937-AC_TRY_COMPILE([
938+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
939 #include <stdarg.h>
940 int foo(int x, ...) {
941 va_list va;
942@@ -2484,45 +2383,41 @@
943 va_arg(va, double);
944 return 0;
945 }
946-], [return foo(10, "", 3.14);], [
947+]], [[return foo(10, "", 3.14);]])],[
948 AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1,
949 [Define if your compiler supports variable length function prototypes
950 (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>])
951 works=yes
952-])
953+],[])
954 AC_MSG_RESULT($works)
955
956 if test "$have_prototypes" = yes; then
957 bad_prototypes=no
958 AC_MSG_CHECKING(for bad exec* prototypes)
959-AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], ,
960- AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
961- [Define if your <unistd.h> contains bad prototypes for exec*()
962- (as it does on SGI IRIX 4.x)])
963+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[char **t;execve("@",t,t);]])],[],[AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
964+ Define if your <unistd.h> contains bad prototypes for exec*()
965+ (as it does on SGI IRIX 4.x))
966 bad_prototypes=yes
967-)
968+])
969 AC_MSG_RESULT($bad_prototypes)
970 fi
971
972 # check if sockaddr has sa_len member
973 AC_MSG_CHECKING(if sockaddr has sa_len member)
974-AC_TRY_COMPILE([#include <sys/types.h>
975-#include <sys/socket.h>],
976-[struct sockaddr x;
977-x.sa_len = 0;],
978- AC_MSG_RESULT(yes)
979- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]),
980- AC_MSG_RESULT(no))
981+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
982+#include <sys/socket.h>]], [[struct sockaddr x;
983+x.sa_len = 0;]])],[AC_MSG_RESULT(yes)
984+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, Define if sockaddr has sa_len member)],[AC_MSG_RESULT(no)])
985
986 va_list_is_array=no
987 AC_MSG_CHECKING(whether va_list is an array)
988-AC_TRY_COMPILE([
989+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
990 #ifdef HAVE_STDARG_PROTOTYPES
991 #include <stdarg.h>
992 #else
993 #include <varargs.h>
994 #endif
995-], [va_list list1, list2; list1 = list2;], , [
996+]], [[va_list list1, list2; list1 = list2;]])],[],[
997 AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind])
998 va_list_is_array=yes
999 ])
1000@@ -2537,9 +2432,9 @@
1001 AC_MSG_CHECKING([gethostbyname_r with 6 args])
1002 OLD_CFLAGS=$CFLAGS
1003 CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
1004- AC_TRY_COMPILE([
1005+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1006 # include <netdb.h>
1007- ], [
1008+ ]], [[
1009 char *name;
1010 struct hostent *he, *res;
1011 char buffer[2048];
1012@@ -2547,12 +2442,12 @@
1013 int h_errnop;
1014
1015 (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop)
1016- ], [
1017+ ]])],[
1018 AC_DEFINE(HAVE_GETHOSTBYNAME_R)
1019 AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1,
1020 [Define this if you have the 6-arg version of gethostbyname_r().])
1021 AC_MSG_RESULT(yes)
1022- ], [
1023+ ],[
1024 AC_MSG_RESULT(no)
1025 AC_MSG_CHECKING([gethostbyname_r with 5 args])
1026 AC_TRY_COMPILE([
1027@@ -2613,7 +2508,7 @@
1028 # Check for --with-fpectl
1029 AC_MSG_CHECKING(for --with-fpectl)
1030 AC_ARG_WITH(fpectl,
1031- AC_HELP_STRING(--with-fpectl, enable SIGFPE catching),
1032+ AS_HELP_STRING(--with-fpectl,enable SIGFPE catching),
1033 [
1034 if test "$withval" != no
1035 then
1036@@ -2633,7 +2528,7 @@
1037 esac
1038 AC_MSG_CHECKING(for --with-libm=STRING)
1039 AC_ARG_WITH(libm,
1040- AC_HELP_STRING(--with-libm=STRING, math library),
1041+ AS_HELP_STRING(--with-libm=STRING,math library),
1042 [
1043 if test "$withval" = no
1044 then LIBM=
1045@@ -2649,7 +2544,7 @@
1046 AC_SUBST(LIBC)
1047 AC_MSG_CHECKING(for --with-libc=STRING)
1048 AC_ARG_WITH(libc,
1049- AC_HELP_STRING(--with-libc=STRING, C library),
1050+ AS_HELP_STRING(--with-libc=STRING,C library),
1051 [
1052 if test "$withval" = no
1053 then LIBC=
1054@@ -2684,20 +2579,20 @@
1055
1056 AC_MSG_CHECKING(for UCS-4 tcl)
1057 have_ucs4_tcl=no
1058-AC_TRY_COMPILE([
1059+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1060 #include <tcl.h>
1061 #if TCL_UTF_MAX != 6
1062 # error "NOT UCS4_TCL"
1063-#endif], [], [
1064+#endif]], [[]])],[
1065 AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6])
1066 have_ucs4_tcl=yes
1067-])
1068+],[])
1069 AC_MSG_RESULT($have_ucs4_tcl)
1070
1071 AC_MSG_CHECKING(what type to use for unicode)
1072 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
1073 AC_ARG_ENABLE(unicode,
1074- AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)),
1075+ AS_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@,Enable Unicode strings (default is yes)),
1076 [],
1077 [enable_unicode=yes])
1078
1079@@ -2764,15 +2659,12 @@
1080 # or fills with zeros (like the Cray J90, according to Tim Peters).
1081 AC_MSG_CHECKING(whether right shift extends the sign bit)
1082 AC_CACHE_VAL(ac_cv_rshift_extends_sign, [
1083-AC_TRY_RUN([
1084+AC_RUN_IFELSE([AC_LANG_SOURCE([[
1085 int main()
1086 {
1087 exit(((-1)>>3 == -1) ? 0 : 1);
1088 }
1089-],
1090-ac_cv_rshift_extends_sign=yes,
1091-ac_cv_rshift_extends_sign=no,
1092-ac_cv_rshift_extends_sign=yes)])
1093+]])],[ac_cv_rshift_extends_sign=yes],[ac_cv_rshift_extends_sign=no],[ac_cv_rshift_extends_sign=yes])])
1094 AC_MSG_RESULT($ac_cv_rshift_extends_sign)
1095 if test "$ac_cv_rshift_extends_sign" = no
1096 then
1097@@ -2784,12 +2676,12 @@
1098 # check for getc_unlocked and related locking functions
1099 AC_MSG_CHECKING(for getc_unlocked() and friends)
1100 AC_CACHE_VAL(ac_cv_have_getc_unlocked, [
1101-AC_TRY_LINK([#include <stdio.h>],[
1102+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[
1103 FILE *f = fopen("/dev/null", "r");
1104 flockfile(f);
1105 getc_unlocked(f);
1106 funlockfile(f);
1107-], ac_cv_have_getc_unlocked=yes, ac_cv_have_getc_unlocked=no)])
1108+]])],[ac_cv_have_getc_unlocked=yes],[ac_cv_have_getc_unlocked=no])])
1109 AC_MSG_RESULT($ac_cv_have_getc_unlocked)
1110 if test "$ac_cv_have_getc_unlocked" = yes
1111 then
1112@@ -2798,8 +2690,7 @@
1113 fi
1114
1115 # check for readline 2.2
1116-AC_TRY_CPP([#include <readline/readline.h>],
1117-have_readline=yes, have_readline=no)
1118+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <readline/readline.h>]])],[have_readline=yes],[have_readline=no])
1119 if test $have_readline = yes
1120 then
1121 AC_EGREP_HEADER([extern int rl_completion_append_character;],
1122@@ -2820,7 +2711,7 @@
1123
1124 AC_MSG_CHECKING(for broken nice())
1125 AC_CACHE_VAL(ac_cv_broken_nice, [
1126-AC_TRY_RUN([
1127+AC_RUN_IFELSE([AC_LANG_SOURCE([[
1128 int main()
1129 {
1130 int val1 = nice(1);
1131@@ -2828,10 +2719,7 @@
1132 exit(0);
1133 exit(1);
1134 }
1135-],
1136-ac_cv_broken_nice=yes,
1137-ac_cv_broken_nice=no,
1138-ac_cv_broken_nice=no)])
1139+]])],[ac_cv_broken_nice=yes],[ac_cv_broken_nice=no],[ac_cv_broken_nice=no])])
1140 AC_MSG_RESULT($ac_cv_broken_nice)
1141 if test "$ac_cv_broken_nice" = yes
1142 then
1143@@ -2842,7 +2730,7 @@
1144 # tzset(3) exists and works like we expect it to
1145 AC_MSG_CHECKING(for working tzset())
1146 AC_CACHE_VAL(ac_cv_working_tzset, [
1147-AC_TRY_RUN([
1148+AC_RUN_IFELSE([AC_LANG_SOURCE([[
1149 #include <stdlib.h>
1150 #include <time.h>
1151 #include <string.h>
1152@@ -2880,10 +2768,7 @@
1153
1154 exit(0);
1155 }
1156-],
1157-ac_cv_working_tzset=yes,
1158-ac_cv_working_tzset=no,
1159-ac_cv_working_tzset=no)])
1160+]])],[ac_cv_working_tzset=yes],[ac_cv_working_tzset=no],[ac_cv_working_tzset=no])])
1161 AC_MSG_RESULT($ac_cv_working_tzset)
1162 if test "$ac_cv_working_tzset" = yes
1163 then
1164@@ -2894,13 +2779,10 @@
1165 # Look for subsecond timestamps in struct stat
1166 AC_MSG_CHECKING(for tv_nsec in struct stat)
1167 AC_CACHE_VAL(ac_cv_stat_tv_nsec,
1168-AC_TRY_COMPILE([#include <sys/stat.h>], [
1169+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
1170 struct stat st;
1171 st.st_mtim.tv_nsec = 1;
1172-],
1173-ac_cv_stat_tv_nsec=yes,
1174-ac_cv_stat_tv_nsec=no,
1175-ac_cv_stat_tv_nsec=no))
1176+]])],[ac_cv_stat_tv_nsec=yes],[ac_cv_stat_tv_nsec=no]))
1177 AC_MSG_RESULT($ac_cv_stat_tv_nsec)
1178 if test "$ac_cv_stat_tv_nsec" = yes
1179 then
1180@@ -2911,12 +2793,10 @@
1181 # On HP/UX 11.0, mvwdelch is a block with a return statement
1182 AC_MSG_CHECKING(whether mvwdelch is an expression)
1183 AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
1184-AC_TRY_COMPILE([#include <curses.h>], [
1185+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
1186 int rtn;
1187 rtn = mvwdelch(0,0,0);
1188-], ac_cv_mvwdelch_is_expression=yes,
1189- ac_cv_mvwdelch_is_expression=no,
1190- ac_cv_mvwdelch_is_expression=yes))
1191+]])],[ac_cv_mvwdelch_is_expression=yes],[ac_cv_mvwdelch_is_expression=no]))
1192 AC_MSG_RESULT($ac_cv_mvwdelch_is_expression)
1193
1194 if test "$ac_cv_mvwdelch_is_expression" = yes
1195@@ -2927,12 +2807,10 @@
1196
1197 AC_MSG_CHECKING(whether WINDOW has _flags)
1198 AC_CACHE_VAL(ac_cv_window_has_flags,
1199-AC_TRY_COMPILE([#include <curses.h>], [
1200+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
1201 WINDOW *w;
1202 w->_flags = 0;
1203-], ac_cv_window_has_flags=yes,
1204- ac_cv_window_has_flags=no,
1205- ac_cv_window_has_flags=no))
1206+]])],[ac_cv_window_has_flags=yes],[ac_cv_window_has_flags=no]))
1207 AC_MSG_RESULT($ac_cv_window_has_flags)
1208
1209
diff --git a/meta-extras/packages/python/python-2.5-manifest.inc b/meta-extras/packages/python/python-2.5-manifest.inc
new file mode 100644
index 0000000000..e80da80d87
--- /dev/null
+++ b/meta-extras/packages/python/python-2.5-manifest.inc
@@ -0,0 +1,296 @@
1########################################################################################################################
2### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Aug 23 10:20:20 2007
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
11PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image 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-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
13PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image 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-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
15DESCRIPTION_python-profile="Python Basic Profiling Support"
16PR_python-profile="ml1"
17RDEPENDS_python-profile="python-core"
18FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
19
20DESCRIPTION_python-threading="Python Threading & Synchronization Support"
21PR_python-threading="ml1"
22RDEPENDS_python-threading="python-core python-lang"
23FILES_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
25DESCRIPTION_python-distutils="Python Distribution Utilities"
26PR_python-distutils="ml1"
27RDEPENDS_python-distutils="python-core"
28FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
29
30DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
31PR_python-textutils="ml1"
32RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
33FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
34
35DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
36PR_python-codecs="ml1"
37RDEPENDS_python-codecs="python-core"
38FILES_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
40DESCRIPTION_python-pickle="Python Persistence Support"
41PR_python-pickle="ml1"
42RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
43FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
44
45DESCRIPTION_python-datetime="Python Calendar and Time support"
46PR_python-datetime="ml1"
47RDEPENDS_python-datetime="python-core python-codecs"
48FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
49
50DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
51PR_python-core="ml3"
52RDEPENDS_python-core=""
53FILES_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/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* "
54
55DESCRIPTION_python-io="Python Low-Level I/O"
56PR_python-io="ml1"
57RDEPENDS_python-io="python-core python-math"
58FILES_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.* "
59
60DESCRIPTION_python-compiler="Python Compiler Support"
61PR_python-compiler="ml1"
62RDEPENDS_python-compiler="python-core"
63FILES_python-compiler="${libdir}/python2.5/compiler "
64
65DESCRIPTION_python-compression="Python High Level Compression Support"
66PR_python-compression="ml1"
67RDEPENDS_python-compression="python-core python-zlib"
68FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
69
70DESCRIPTION_python-re="Python Regular Expression APIs"
71PR_python-re="ml1"
72RDEPENDS_python-re="python-core"
73FILES_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.* "
74
75DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
76PR_python-xmlrpc="ml1"
77RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
78FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
79
80DESCRIPTION_python-terminal="Python Terminal Controlling Support"
81PR_python-terminal="ml1"
82RDEPENDS_python-terminal="python-core python-io"
83FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
84
85DESCRIPTION_python-email="Python Email Support"
86PR_python-email="ml1"
87RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
88FILES_python-email="${libdir}/python2.5/email "
89
90DESCRIPTION_python-image="Python Graphical Image Handling"
91PR_python-image="ml1"
92RDEPENDS_python-image="python-core"
93FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
94
95DESCRIPTION_python-core-dbg="Python core module debug information"
96PR_python-core-dbg="ml1"
97RDEPENDS_python-core-dbg="python-core"
98FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
99
100DESCRIPTION_python-resource="Python Resource Control Interface"
101PR_python-resource="ml1"
102RDEPENDS_python-resource="python-core"
103FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
104
105DESCRIPTION_python-devel="Python Development Package"
106PR_python-devel="ml1"
107RDEPENDS_python-devel="python-core"
108FILES_python-devel="${includedir} ${libdir}/python2.5/config "
109
110DESCRIPTION_python-math="Python Math Support"
111PR_python-math="ml1"
112RDEPENDS_python-math="python-core"
113FILES_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.* "
114
115DESCRIPTION_python-hotshot="Python Hotshot Profiler"
116PR_python-hotshot="ml1"
117RDEPENDS_python-hotshot="python-core"
118FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
119
120DESCRIPTION_python-unixadmin="Python Unix Administration Support"
121PR_python-unixadmin="ml1"
122RDEPENDS_python-unixadmin="python-core"
123FILES_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.* "
124
125DESCRIPTION_python-syslog="Python's syslog Interface"
126PR_python-syslog="ml1"
127RDEPENDS_python-syslog="python-core"
128FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
129
130DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
131PR_python-tkinter="ml1"
132RDEPENDS_python-tkinter="python-core"
133FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
134
135DESCRIPTION_python-gdbm="Python GNU Database Support"
136PR_python-gdbm="ml1"
137RDEPENDS_python-gdbm="python-core"
138FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
139
140DESCRIPTION_python-fcntl="Python's fcntl Interface"
141PR_python-fcntl="ml1"
142RDEPENDS_python-fcntl="python-core"
143FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
144
145DESCRIPTION_python-netclient="Python Internet Protocol Clients"
146PR_python-netclient="ml2"
147RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold"
148FILES_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.* "
149
150DESCRIPTION_python-pprint="Python Pretty-Print Support"
151PR_python-pprint="ml1"
152RDEPENDS_python-pprint="python-core"
153FILES_python-pprint="${libdir}/python2.5/pprint.* "
154
155DESCRIPTION_python-netserver="Python Internet Protocol Servers"
156PR_python-netserver="ml1"
157RDEPENDS_python-netserver="python-core python-netclient"
158FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* "
159
160DESCRIPTION_python-curses="Python Curses Support"
161PR_python-curses="ml1"
162RDEPENDS_python-curses="python-core"
163FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so "
164
165DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
166PR_python-smtpd="ml1"
167RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
168FILES_python-smtpd="${bindir}/smtpd.* "
169
170DESCRIPTION_python-html="Python HTML Processing"
171PR_python-html="ml1"
172RDEPENDS_python-html="python-core"
173FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* "
174
175DESCRIPTION_python-readline="Python Readline Support"
176PR_python-readline="ml1"
177RDEPENDS_python-readline="python-core"
178FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* "
179
180DESCRIPTION_python-subprocess="Python Subprocess Support"
181PR_python-subprocess="ml1"
182RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
183FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
184
185DESCRIPTION_python-pydoc="Python Interactive Help Support"
186PR_python-pydoc="ml1"
187RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
188FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* "
189
190DESCRIPTION_python-logging="Python Logging Support"
191PR_python-logging="ml1"
192RDEPENDS_python-logging="python-core"
193FILES_python-logging="${libdir}/python2.5/logging "
194
195DESCRIPTION_python-mailbox="Python Mailbox Format Support"
196PR_python-mailbox="ml1"
197RDEPENDS_python-mailbox="python-core python-mime"
198FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
199
200DESCRIPTION_python-xml="Python basic XML support."
201PR_python-xml="ml2"
202RDEPENDS_python-xml="python-core python-re python-netclient"
203FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
204
205DESCRIPTION_python-mime="Python MIME Handling APIs"
206PR_python-mime="ml1"
207RDEPENDS_python-mime="python-core python-io"
208FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
209
210DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
211PR_python-sqlite3="ml1"
212RDEPENDS_python-sqlite3="python-core"
213FILES_python-sqlite3="${libdir}/python2.5/sqlite3 "
214
215DESCRIPTION_python-tests="Python Tests"
216PR_python-tests="ml1"
217RDEPENDS_python-tests="python-core"
218FILES_python-tests="${libdir}/python2.5/test "
219
220DESCRIPTION_python-unittest="Python Unit Testing Framework"
221PR_python-unittest="ml1"
222RDEPENDS_python-unittest="python-core python-stringold python-lang"
223FILES_python-unittest="${libdir}/python2.5/unittest.* "
224
225DESCRIPTION_python-stringold="Python String APIs [deprecated]"
226PR_python-stringold="ml1"
227RDEPENDS_python-stringold="python-core python-re"
228FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* "
229
230DESCRIPTION_python-robotparser="Python robots.txt parser"
231PR_python-robotparser="ml1"
232RDEPENDS_python-robotparser="python-core python-netclient"
233FILES_python-robotparser="${libdir}/python2.5/robotparser.* "
234
235DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
236PR_python-lib-old-and-deprecated="ml1"
237RDEPENDS_python-lib-old-and-deprecated="python-core"
238FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old "
239
240DESCRIPTION_python-compile="Python Bytecode Compilation Support"
241PR_python-compile="ml1"
242RDEPENDS_python-compile="python-core"
243FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* "
244
245DESCRIPTION_python-debugger="Python Debugger"
246PR_python-debugger="ml1"
247RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell"
248FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
249
250DESCRIPTION_python-shell="Python Shell-Like Functionality"
251PR_python-shell="ml1"
252RDEPENDS_python-shell="python-core python-re"
253FILES_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.* "
254
255DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
256PR_python-bsddb="ml1"
257RDEPENDS_python-bsddb="python-core"
258FILES_python-bsddb="${libdir}/python2.5/bsddb "
259
260DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
261PR_python-mmap="ml1"
262RDEPENDS_python-mmap="python-core python-io"
263FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so "
264
265DESCRIPTION_python-zlib="Python zlib Support."
266PR_python-zlib="ml1"
267RDEPENDS_python-zlib="python-core"
268FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so "
269
270DESCRIPTION_python-db="Python File-Based Database Support"
271PR_python-db="ml1"
272RDEPENDS_python-db="python-core"
273FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* "
274
275DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
276PR_python-crypt="ml1"
277RDEPENDS_python-crypt="python-core"
278FILES_python-crypt="${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/md5.so ${libdir}/python2.5/lib-dynload/rotor.so ${libdir}/python2.5/lib-dynload/sha.so "
279
280DESCRIPTION_python-idle="Python Integrated Development Environment"
281PR_python-idle="ml1"
282RDEPENDS_python-idle="python-core python-tkinter"
283FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib "
284
285DESCRIPTION_python-lang="Python Low-Level Language Support"
286PR_python-lang="ml1"
287RDEPENDS_python-lang="python-core"
288FILES_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.* "
289
290DESCRIPTION_python-audio="Python Audio Handling"
291PR_python-audio="ml1"
292RDEPENDS_python-audio="python-core"
293FILES_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 "
294
295
296
diff --git a/meta-extras/packages/python/python-2.5.1/autohell.patch b/meta-extras/packages/python/python-2.5.1/autohell.patch
new file mode 100644
index 0000000000..e2d63145be
--- /dev/null
+++ b/meta-extras/packages/python/python-2.5.1/autohell.patch
@@ -0,0 +1,49 @@
1#
2# FIXME: Don't simply rip this test out... add getting it from cache
3#
4Index: Python-2.5.1/configure.in
5===================================================================
6--- Python-2.5.1.orig/configure.in
7+++ Python-2.5.1/configure.in
8@@ -3367,41 +3367,6 @@ else
9 AC_MSG_RESULT(no)
10 fi
11
12-AC_MSG_CHECKING(for %zd printf() format support)
13-AC_TRY_RUN([#include <stdio.h>
14-#include <stddef.h>
15-#include <string.h>
16-
17-int main()
18-{
19- char buffer[256];
20-
21-#ifdef HAVE_SSIZE_T
22-typedef ssize_t Py_ssize_t;
23-#elif SIZEOF_VOID_P == SIZEOF_LONG
24-typedef long Py_ssize_t;
25-#else
26-typedef int Py_ssize_t;
27-#endif
28-
29- if(sprintf(buffer, "%zd", (size_t)123) < 0)
30- return 1;
31-
32- if (strcmp(buffer, "123"))
33- return 1;
34-
35- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
36- return 1;
37-
38- if (strcmp(buffer, "-123"))
39- return 1;
40-
41- return 0;
42-}],
43-[AC_MSG_RESULT(yes)
44- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])],
45- AC_MSG_RESULT(no))
46-
47 AC_CHECK_TYPE(socklen_t,,
48 AC_DEFINE(socklen_t,int,
49 Define to `int' if <sys/socket.h> does not define.),[
diff --git a/meta-extras/packages/python/python-2.4.4/bindir-libdir.patch b/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch
index 27ae5dce5b..047c358a55 100644
--- a/meta-extras/packages/python/python-2.4.4/bindir-libdir.patch
+++ b/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch
@@ -3,9 +3,11 @@
3# Patch managed by http://www.holgerschurig.de/patcher.html 3# Patch managed by http://www.holgerschurig.de/patcher.html
4# 4#
5 5
6--- Python-2.4c1/Makefile.pre.in~bindir-libdir.patch 6Index: Python-2.5.1/Makefile.pre.in
7+++ Python-2.4c1/Makefile.pre.in 7===================================================================
8@@ -78,8 +78,8 @@ 8--- Python-2.5.1.orig/Makefile.pre.in
9+++ Python-2.5.1/Makefile.pre.in
10@@ -83,8 +83,8 @@ prefix= @prefix@
9 exec_prefix= @exec_prefix@ 11 exec_prefix= @exec_prefix@
10 12
11 # Expanded directories 13 # Expanded directories
diff --git a/meta-extras/packages/python/python-2.4.4/crosscompile.patch b/meta-extras/packages/python/python-2.5.1/crosscompile.patch
index f917bb2567..f456048ef5 100644
--- a/meta-extras/packages/python/python-2.4.4/crosscompile.patch
+++ b/meta-extras/packages/python/python-2.5.1/crosscompile.patch
@@ -1,11 +1,11 @@
1
2# 1#
3# Patch managed by http://www.holgerschurig.de/patcher.html 2# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de>
4# 3#
5 4Index: Python-2.5.1/Makefile.pre.in
6--- Python-2.4c1/Makefile.pre.in~crosscompile 5===================================================================
7+++ Python-2.4c1/Makefile.pre.in 6--- Python-2.5.1.orig/Makefile.pre.in
8@@ -162,6 +162,7 @@ 7+++ Python-2.5.1/Makefile.pre.in
8@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
9 9
10 PYTHON= python$(EXE) 10 PYTHON= python$(EXE)
11 BUILDPYTHON= python$(BUILDEXE) 11 BUILDPYTHON= python$(BUILDEXE)
@@ -13,7 +13,7 @@
13 13
14 # === Definitions added by makesetup === 14 # === Definitions added by makesetup ===
15 15
16@@ -188,7 +189,7 @@ 16@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
17 ########################################################################## 17 ##########################################################################
18 # Parser 18 # Parser
19 PGEN= Parser/pgen$(EXE) 19 PGEN= Parser/pgen$(EXE)
@@ -22,7 +22,7 @@
22 POBJS= \ 22 POBJS= \
23 Parser/acceler.o \ 23 Parser/acceler.o \
24 Parser/grammar1.o \ 24 Parser/grammar1.o \
25@@ -320,8 +321,8 @@ 25@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON)
26 # Build the shared modules 26 # Build the shared modules
27 sharedmods: $(BUILDPYTHON) 27 sharedmods: $(BUILDPYTHON)
28 case $$MAKEFLAGS in \ 28 case $$MAKEFLAGS in \
@@ -32,8 +32,8 @@
32+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ 32+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
33 esac 33 esac
34 34
35 # buildno should really depend on something like LIBRARY_SRC 35 # Build static library
36@@ -442,7 +443,7 @@ 36@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
37 37
38 38
39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) 39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
@@ -42,19 +42,19 @@
42 42
43 $(PGEN): $(PGENOBJS) 43 $(PGEN): $(PGENOBJS)
44 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) 44 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
45@@ -718,19 +719,19 @@ 45@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib
46 done 46 done
47 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt 47 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
48 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 48 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
49- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ 49- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
50+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ 50+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
51 -d $(LIBDEST) -f \ 51 -d $(LIBDEST) -f \
52 -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) 52 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
53 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 53 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
54- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ 54- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
55+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ 55+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
56 -d $(LIBDEST) -f \ 56 -d $(LIBDEST) -f \
57 -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) 57 -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
58 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 58 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
59- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ 59- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
60+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ 60+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
@@ -66,7 +66,7 @@
66 -d $(LIBDEST)/site-packages -f \ 66 -d $(LIBDEST)/site-packages -f \
67 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 67 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
68 68
69@@ -825,7 +826,7 @@ 69@@ -885,7 +886,7 @@ libainstall: all
70 # Install the dynamically loadable modules 70 # Install the dynamically loadable modules
71 # This goes into $(exec_prefix) 71 # This goes into $(exec_prefix)
72 sharedinstall: 72 sharedinstall:
@@ -75,9 +75,11 @@
75 --prefix=$(prefix) \ 75 --prefix=$(prefix) \
76 --install-scripts=$(BINDIR) \ 76 --install-scripts=$(BINDIR) \
77 --install-platlib=$(DESTSHARED) \ 77 --install-platlib=$(DESTSHARED) \
78--- Python-2.4c1/setup.py~crosscompile 78Index: Python-2.5.1/setup.py
79+++ Python-2.4c1/setup.py 79===================================================================
80@@ -206,6 +206,7 @@ 80--- Python-2.5.1.orig/setup.py
81+++ Python-2.5.1/setup.py
82@@ -211,6 +211,7 @@ class PyBuildExt(build_ext):
81 except ImportError, why: 83 except ImportError, why:
82 self.announce('*** WARNING: renaming "%s" since importing it' 84 self.announce('*** WARNING: renaming "%s" since importing it'
83 ' failed: %s' % (ext.name, why), level=3) 85 ' failed: %s' % (ext.name, why), level=3)
@@ -85,7 +87,7 @@
85 assert not self.inplace 87 assert not self.inplace
86 basename, tail = os.path.splitext(ext_filename) 88 basename, tail = os.path.splitext(ext_filename)
87 newname = basename + "_failed" + tail 89 newname = basename + "_failed" + tail
88@@ -239,8 +240,8 @@ 90@@ -244,8 +245,8 @@ class PyBuildExt(build_ext):
89 91
90 def detect_modules(self): 92 def detect_modules(self):
91 # Ensure that /usr/local is always used 93 # Ensure that /usr/local is always used
@@ -94,9 +96,9 @@
94+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 96+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
95+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 97+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
96 98
97 # Add paths to popular package managers on OS X/darwin 99 # Add paths specified in the environment variables LDFLAGS and
98 if sys.platform == "darwin": 100 # CPPFLAGS for header and library files.
99@@ -293,6 +294,9 @@ 101@@ -341,6 +342,9 @@ class PyBuildExt(build_ext):
100 102
101 # XXX Omitted modules: gl, pure, dl, SGI-specific modules 103 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
102 104
diff --git a/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch
new file mode 100644
index 0000000000..6beeb6e022
--- /dev/null
+++ b/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch
@@ -0,0 +1,13 @@
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-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch
index 602aa8e021..93bd343381 100644
--- a/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch
+++ b/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch
@@ -3,9 +3,11 @@
3# Patch managed by http://www.holgerschurig.de/patcher.html 3# Patch managed by http://www.holgerschurig.de/patcher.html
4# 4#
5 5
6--- Python-2.4.1/setup.py~fix-tkinter-detection 6Index: Python-2.5.1/setup.py
7+++ Python-2.4.1/setup.py 7===================================================================
8@@ -999,7 +999,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):
9 dotversion = dotversion[:-1] + '.' + dotversion[-1] 11 dotversion = dotversion[:-1] + '.' + dotversion[-1]
10 tcl_include_sub = [] 12 tcl_include_sub = []
11 tk_include_sub = [] 13 tk_include_sub = []
@@ -14,7 +16,7 @@
14 tcl_include_sub += [dir + os.sep + "tcl" + dotversion] 16 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
15 tk_include_sub += [dir + os.sep + "tk" + dotversion] 17 tk_include_sub += [dir + os.sep + "tk" + dotversion]
16 tk_include_sub += tcl_include_sub 18 tk_include_sub += tcl_include_sub
17@@ -1018,22 +1018,6 @@ 19@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext):
18 if dir not in include_dirs: 20 if dir not in include_dirs:
19 include_dirs.append(dir) 21 include_dirs.append(dir)
20 22
diff --git a/meta-extras/packages/python/python-2.4.4/sitebranding.patch b/meta-extras/packages/python/python-2.5.1/sitebranding.patch
index 85bb83a506..c6e486ae97 100644
--- a/meta-extras/packages/python/python-2.4.4/sitebranding.patch
+++ b/meta-extras/packages/python/python-2.5.1/sitebranding.patch
@@ -3,9 +3,11 @@
3# Patch managed by http://www.holgerschurig.de/patcher.html 3# Patch managed by http://www.holgerschurig.de/patcher.html
4# 4#
5 5
6--- Python-2.4.3/Lib/site.py~sitebranding 6Index: Python-2.5.1/Lib/site.py
7+++ Python-2.4.3/Lib/site.py 7===================================================================
8@@ -305,8 +305,9 @@ 8--- Python-2.5.1.orig/Lib/site.py
9+++ Python-2.5.1/Lib/site.py
10@@ -323,8 +323,9 @@ def setcopyright():
9 "Jython is maintained by the Jython developers (www.jython.org).") 11 "Jython is maintained by the Jython developers (www.jython.org).")
10 else: 12 else:
11 __builtin__.credits = _Printer("credits", """\ 13 __builtin__.credits = _Printer("credits", """\
diff --git a/meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch
index 999bddc449..999bddc449 100644
--- a/meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch
+++ b/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch
diff --git a/meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch
index 76ae883c1d..3356c1abbe 100644
--- a/meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch
+++ b/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch
@@ -16,22 +16,20 @@
16 16
17 # python_build: (Boolean) if true, we're either building Python or 17 # python_build: (Boolean) if true, we're either building Python or
18 # building an extension with an un-installed Python, so we use 18 # building an extension with an un-installed Python, so we use
19@@ -192,7 +192,8 @@ 19@@ -192,7 +192,7 @@
20 else: 20 else:
21 # The name of the config.h file changed in 2.2 21 # The name of the config.h file changed in 2.2
22 config_h = 'pyconfig.h' 22 config_h = 'pyconfig.h'
23- return os.path.join(inc_dir, config_h) 23- return os.path.join(inc_dir, config_h)
24+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
25+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) 24+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
26 25
27 26
28 def get_makefile_filename(): 27 def get_makefile_filename():
29@@ -200,7 +201,8 @@ 28@@ -200,7 +200,7 @@
30 if python_build: 29 if python_build:
31 return os.path.join(os.path.dirname(sys.executable), "Makefile") 30 return os.path.join(os.path.dirname(sys.executable), "Makefile")
32 lib_dir = get_python_lib(plat_specific=1, standard_lib=1) 31 lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
33- return os.path.join(lib_dir, "config", "Makefile") 32- return os.path.join(lib_dir, "config", "Makefile")
34+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
35+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) 33+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
36 34
37 35
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
new file mode 100644
index 0000000000..6beeb6e022
--- /dev/null
+++ b/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch
@@ -0,0 +1,13 @@
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-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
new file mode 100644
index 0000000000..54109afd62
--- /dev/null
+++ b/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch
@@ -0,0 +1,16 @@
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
new file mode 100644
index 0000000000..ea6e257043
--- /dev/null
+++ b/meta-extras/packages/python/python-native_2.5.1.bb
@@ -0,0 +1,34 @@
1DESCRIPTION = "The Python Programming Language"
2HOMEPAGE = "http://www.python.org"
3LICENSE = "PSF"
4SECTION = "devel/python"
5PRIORITY = "optional"
6DEPENDS = ""
7PR = "ml1"
8
9EXCLUDE_FROM_WORLD = "1"
10
11SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
12 file://bindir-libdir.patch;patch=1 \
13 file://cross-distutils.patch;patch=1 \
14 file://dont-modify-shebang-line.patch;patch=1 \
15 file://default-is-optimized.patch;patch=1"
16S = "${WORKDIR}/Python-${PV}"
17
18inherit autotools native
19
20prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}"
21exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
22
23EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
24 --without-cxx --with-signal-module --with-wctype-functions"
25EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
26
27#do_configure() {
28# # the autofoo stuff is too old to allow regenerating
29# oe_runconf
30#}
31
32do_stage_append() {
33 install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
34}
diff --git a/meta-extras/packages/python/python_2.5.1.bb b/meta-extras/packages/python/python_2.5.1.bb
new file mode 100644
index 0000000000..63b7c368a8
--- /dev/null
+++ b/meta-extras/packages/python/python_2.5.1.bb
@@ -0,0 +1,96 @@
1DESCRIPTION = "Python Programming Language"
2HOMEPAGE = "http://www.python.org"
3LICENSE = "PSF"
4SECTION = "devel/python"
5PRIORITY = "optional"
6DEPENDS = "python-native readline zlib gdbm openssl sqlite3"
7DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
8
9# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
10PR = "ml1"
11
12PYTHON_MAJMIN = "2.5"
13
14SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
15 file://bindir-libdir.patch;patch=1 \
16 file://crosscompile.patch;patch=1 \
17 file://fix-tkinter-detection.patch;patch=1 \
18 file://autohell.patch;patch=1 \
19 file://sitebranding.patch;patch=1 \
20 file://default-is-optimized.patch;patch=1"
21S = "${WORKDIR}/Python-${PV}"
22
23inherit autotools
24
25EXTRA_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#
33do_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
45do_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
63do_stage() {
64 install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
65 oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
66}
67
68do_install() {
69 install -m 0644 Makefile.orig Makefile
70 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
71 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
72 STAGING_LIBDIR=${STAGING_LIBDIR} \
73 STAGING_INCDIR=${STAGING_INCDIR} \
74 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
75 DESTDIR=${D} LIBDIR=${libdir} install
76}
77
78require python-${PYTHON_MAJMIN}-manifest.inc
79
80RPROVIDES_python-core = "python"
81RPROVIDES_python-curses = "python"
82
83PACKAGES =+ "libpython2"
84FILES_libpython2 = "${libdir}/libpython*"
85
86# catch debug extensions
87FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
88
89# catch all the rest (unsorted)
90PACKAGES += "python-misc"
91FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
92
93# catch manpage
94PACKAGES += "python-man"
95FILES_python-man = "${datadir}/man"
96
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 21:47:02 +0000