diff options
| author |   Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-15 13:55:06 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-15 13:55:06 +0000 |
| commit | 3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc (patch) | |
| tree | d6731c1df8707972687bac18db0336599cfffe66 /meta-extras | |
| parent | eaafa55d861b0a31e62895845730e778a0253ec9 (diff) | |
| download | openembedded-core-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')
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 @@ ---- Python-2.3.3/acinclude.m4 1969-12-31 19:00:00.000000000 -0500 -+++ Python-2.3.3/acinclude.m4 2004-02-17 12:22:29.000000000 -0500 -@@ -0,0 +1,10 @@ -+dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore -+dnl If this macro is not defined by Autoconf, define it here. -+ -+m4_ifdef([AC_PROG_CXX_WORKS], -+ [], -+ [m4_define([AC_PROG_CXX_WORKS], -+ [AC_LANG_PUSH(C++)dnl -+ _AC_COMPILER_EXEEXT -+ AC_LANG_POP()] -+ )]) ---- Python-2.3.3/configure.in 2003-11-18 14:59:39.000000000 -0500 -+++ Python-2.3.3/configure.in 2004-02-17 12:22:27.000000000 -0500 -@@ -4,8 +4,8 @@ - m4_define(PYTHON_VERSION, 2.3) - - AC_REVISION($Revision: 1.427.4.10 $) --AC_PREREQ(2.53) --AC_INIT(python, PYTHON_VERSION) -+AC_PREREQ(2.59) -+AC_INIT([python],[PYTHON_VERSION]) - AC_CONFIG_SRCDIR([Include/object.h]) - AC_CONFIG_HEADER(pyconfig.h) - -@@ -58,7 +58,7 @@ - - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_ENABLE(framework, -- AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework), -+ AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework), - [ - case $enableval in - yes) -@@ -92,8 +92,7 @@ - AC_SUBST(PYTHONFRAMEWORKINSTALLDIR) - - ##AC_ARG_WITH(dyld, --## AC_HELP_STRING(--with-dyld, --## Use (OpenStep|Rhapsody) dynamic linker)) -+## AS_HELP_STRING(--with-dyld,## Use (OpenStep|Rhapsody) dynamic linker)) - ## - # Set name for machine-dependent library files - AC_SUBST(MACHDEP) -@@ -227,7 +226,7 @@ - # on that fiddles with OPT and BASECFLAGS? - AC_MSG_CHECKING(for --without-gcc) - AC_ARG_WITH(gcc, -- AC_HELP_STRING(--without-gcc,never use gcc), -+ AS_HELP_STRING(--without-gcc,never use gcc), - [ - case $withval in - no) CC=cc -@@ -273,7 +272,7 @@ - MAINOBJ=python.o - AC_MSG_CHECKING(for --with-cxx=<compiler>) - AC_ARG_WITH(cxx, -- AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support), -+ AS_HELP_STRING(--with-cxx=<compiler>,enable C++ support), - [ - check_cxx=no - case $withval in -@@ -298,15 +297,6 @@ - dnl --without-cxx was given. - dnl Finally, it does not test whether CXX is g++. - --dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore --ifdef([AC_PROG_CXX_WORKS],[], -- [AC_DEFUN([AC_PROG_CXX_WORKS], -- [AC_LANG_PUSH(C++)dnl -- _AC_COMPILER_EXEEXT -- AC_LANG_POP() -- ] --)]) -- - if test "$check_cxx" = "yes" - then - AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound) -@@ -348,7 +338,7 @@ - AC_EXEEXT - AC_MSG_CHECKING(for --with-suffix) - AC_ARG_WITH(suffix, -- AC_HELP_STRING(--with-suffix=.exe, set executable suffix), -+ AS_HELP_STRING(--with-suffix=.exe,set executable suffix), - [ - case $withval in - no) EXEEXT=;; -@@ -474,7 +464,7 @@ - - AC_MSG_CHECKING(for --enable-shared) - AC_ARG_ENABLE(shared, -- AC_HELP_STRING(--enable-shared, disable/enable building shared python library)) -+ AS_HELP_STRING(--enable-shared,disable/enable building shared python library)) - - if test -z "$enable_shared" - then -@@ -583,7 +573,7 @@ - # Check for --with-pydebug - AC_MSG_CHECKING(for --with-pydebug) - AC_ARG_WITH(pydebug, -- AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined), -+ AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined), - [ - if test "$withval" != no - then -@@ -660,10 +650,7 @@ - AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing) - ac_save_cc="$CC" - CC="$CC -fno-strict-aliasing" -- AC_TRY_RUN([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) -+ 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]) - CC="$ac_save_cc" - AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok) - if test $ac_cv_no_strict_aliasing_ok = yes -@@ -711,10 +698,7 @@ - AC_CACHE_VAL(ac_cv_opt_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -OPT:Olimit=0" --AC_TRY_RUN([int main() { return 0; }], -- ac_cv_opt_olimit_ok=yes, -- ac_cv_opt_olimit_ok=no, -- ac_cv_opt_olimit_ok=no) -+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]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_opt_olimit_ok) - if test $ac_cv_opt_olimit_ok = yes; then -@@ -733,10 +717,7 @@ - AC_CACHE_VAL(ac_cv_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -Olimit 1500" -- AC_TRY_RUN([int main() { return 0; }], -- ac_cv_olimit_ok=yes, -- ac_cv_olimit_ok=no, -- ac_cv_olimit_ok=no) -+ 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]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_olimit_ok) - if test $ac_cv_olimit_ok = yes; then -@@ -751,7 +732,7 @@ - # options before we can check whether -Kpthread improves anything. - AC_MSG_CHECKING(whether pthreads are available without options) - AC_CACHE_VAL(ac_cv_pthread_is_default, --[AC_TRY_RUN([ -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -763,14 +744,11 @@ - (void)pthread_detach(p); - return 0; - } --], --[ -+]])],[ - ac_cv_pthread_is_default=yes - ac_cv_kthread=no - ac_cv_pthread=no --], -- ac_cv_pthread_is_default=no, -- ac_cv_pthread_is_default=no) -+],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no]) - ]) - AC_MSG_RESULT($ac_cv_pthread_is_default) - -@@ -788,7 +766,7 @@ - AC_CACHE_VAL(ac_cv_kpthread, - [ac_save_cc="$CC" - CC="$CC -Kpthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -800,10 +778,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kpthread=yes, -- ac_cv_kpthread=no, -- ac_cv_kpthread=no) -+]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kpthread) - fi -@@ -819,7 +794,7 @@ - AC_CACHE_VAL(ac_cv_kthread, - [ac_save_cc="$CC" - CC="$CC -Kthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -831,10 +806,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kthread=yes, -- ac_cv_kthread=no, -- ac_cv_kthread=no) -+]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kthread) - fi -@@ -850,7 +822,7 @@ - AC_CACHE_VAL(ac_cv_thread, - [ac_save_cc="$CC" - CC="$CC -pthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -862,10 +834,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_pthread=yes, -- ac_cv_pthread=no, -- ac_cv_pthread=no) -+]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_pthread) - fi -@@ -911,11 +880,11 @@ - - dnl # check for ANSI or K&R ("traditional") preprocessor - dnl AC_MSG_CHECKING(for C preprocessor type) --dnl AC_TRY_COMPILE([ -+dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - dnl #define spam(name, doc) {#name, &name, #name "() -- " doc} - dnl int foo; - dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something"); --dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional) -+dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional]) - dnl AC_MSG_RESULT($cpp_type) - - # checks for header files -@@ -941,19 +910,13 @@ - - # Check whether using makedev requires defining _OSF_SOURCE - AC_MSG_CHECKING(for makedev) --AC_TRY_LINK([#include <sys/types.h> ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "no"; then - # we didn't link, try if _OSF_SOURCE will allow us to link -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #define _OSF_SOURCE 1 - #include <sys/types.h> -- ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+ ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "yes"; then - AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.]) - fi -@@ -972,11 +935,11 @@ - - use_lfs=yes - AC_MSG_CHECKING(Solaris LFS bug) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define _LARGEFILE_SOURCE 1 - #define _FILE_OFFSET_BITS 64 - #include <sys/resource.h> --],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes) -+]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes]) - AC_MSG_RESULT($sol_lfs_bug) - if test "$sol_lfs_bug" = "yes"; then - use_lfs=no -@@ -1018,10 +981,10 @@ - - AC_MSG_CHECKING(for long long support) - have_long_long=no --AC_TRY_COMPILE([], [long long x; x = (long long)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ - AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) - have_long_long=yes --]) -+],[]) - AC_MSG_RESULT($have_long_long) - if test "$have_long_long" = yes ; then - AC_CHECK_SIZEOF(long long, 8) -@@ -1029,10 +992,10 @@ - - AC_MSG_CHECKING(for uintptr_t support) - have_uintptr_t=no --AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[ - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.]) - have_uintptr_t=yes --]) -+],[]) - AC_MSG_RESULT($have_uintptr_t) - if test "$have_uintptr_t" = yes ; then - AC_CHECK_SIZEOF(uintptr_t, 4) -@@ -1041,7 +1004,7 @@ - # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>. - AC_MSG_CHECKING(size of off_t) - AC_CACHE_VAL(ac_cv_sizeof_off_t, --[AC_TRY_RUN([#include <stdio.h> -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <sys/types.h> - main() - { -@@ -1049,10 +1012,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(off_t)); - exit(0); --}], --ac_cv_sizeof_off_t=`cat conftestval`, --ac_cv_sizeof_off_t=0, --ac_cv_sizeof_off_t=4) -+}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_off_t) - AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t, -@@ -1075,7 +1035,7 @@ - # AC_CHECK_SIZEOF() doesn't include <time.h>. - AC_MSG_CHECKING(size of time_t) - AC_CACHE_VAL(ac_cv_sizeof_time_t, --[AC_TRY_RUN([#include <stdio.h> -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <time.h> - main() - { -@@ -1083,10 +1043,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(time_t)); - exit(0); --}], --ac_cv_sizeof_time_t=`cat conftestval`, --ac_cv_sizeof_time_t=0, --ac_cv_sizeof_time_t=4) -+}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_time_t) - AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, -@@ -1104,13 +1061,13 @@ - fi - AC_MSG_CHECKING(for pthread_t) - have_pthread_t=no --AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[]) - AC_MSG_RESULT($have_pthread_t) - if test "$have_pthread_t" = yes ; then - # AC_CHECK_SIZEOF() doesn't include <pthread.h>. - AC_MSG_CHECKING(size of pthread_t) - AC_CACHE_VAL(ac_cv_sizeof_pthread_t, -- [AC_TRY_RUN([#include <stdio.h> -+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <pthread.h> - main() - { -@@ -1118,10 +1075,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(pthread_t)); - exit(0); -- }], -- ac_cv_sizeof_pthread_t=`cat conftestval`, -- ac_cv_sizeof_pthread_t=0, -- ac_cv_sizeof_pthread_t=4) -+ }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_pthread_t) - AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t, -@@ -1131,7 +1085,7 @@ - - AC_MSG_CHECKING(for --enable-toolbox-glue) - AC_ARG_ENABLE(toolbox-glue, -- AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions)) -+ AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions)) - - if test -z "$enable_toolbox_glue" - then -@@ -1436,13 +1390,10 @@ - # checks for system dependent C++ extensions support - case "$ac_sys_system" in - AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) -- AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"], -- [loadAndInit("", 0, "")], -- [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, - [Define for AIX if your compiler is a genuine IBM xlC/xlC_r - and you want support for AIX C++ shared extension modules.]) -- AC_MSG_RESULT(yes)], -- [AC_MSG_RESULT(no)]);; -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);; - *) ;; - esac - -@@ -1464,7 +1415,7 @@ - - AC_MSG_CHECKING(for --with-libs) - AC_ARG_WITH(libs, -- AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs), -+ AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs), - [ - AC_MSG_RESULT($withval) - LIBS="$withval $LIBS" -@@ -1476,7 +1427,7 @@ - AC_SUBST(SIGNAL_OBJS) - AC_MSG_CHECKING(for --with-signal-module) - AC_ARG_WITH(signal-module, -- AC_HELP_STRING(--with-signal-module, disable/enable signal module)) -+ AS_HELP_STRING(--with-signal-module,disable/enable signal module)) - - if test -z "$with_signal_module" - then with_signal_module="yes" -@@ -1498,7 +1449,7 @@ - AC_MSG_CHECKING(for --with-dec-threads) - AC_SUBST(LDLAST) - AC_ARG_WITH(dec-threads, -- AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries), -+ AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries), - [ - AC_MSG_RESULT($withval) - LDLAST=-threads -@@ -1518,12 +1469,12 @@ - AC_MSG_CHECKING(for --with-threads) - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(threads, -- AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support)) -+ AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support)) - - # --with-thread is deprecated, but check for it anyway - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(thread, -- AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads), -+ AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads), - [with_threads=$with_thread]) - - if test -z "$with_threads" -@@ -1603,7 +1554,7 @@ - THREADOBJ="Python/thread.o"],[ - AC_MSG_CHECKING(for --with-pth) - AC_ARG_WITH([pth], -- AC_HELP_STRING(--with-pth, use GNU pth threading libraries), -+ AS_HELP_STRING(--with-pth,use GNU pth threading libraries), - [AC_MSG_RESULT($withval) - AC_DEFINE([WITH_THREAD]) - AC_DEFINE([HAVE_PTH], 1, -@@ -1618,10 +1569,10 @@ - _libs=$LIBS - LIBS="$LIBS -lpthread" - AC_MSG_CHECKING([for pthread_create in -lpthread]) -- AC_TRY_LINK([#include <pthread.h> -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h> - --void * start_routine (void *arg) { exit (0); }], [ --pthread_create (NULL, NULL, start_routine, NULL)], [ -+void * start_routine (void *arg) { exit (0); }]], [[ -+pthread_create (NULL, NULL, start_routine, NULL)]])],[ - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_THREAD) - posix_threads=yes -@@ -1705,7 +1656,7 @@ - - AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported) - AC_CACHE_VAL(ac_cv_pthread_system_supported, -- [AC_TRY_RUN([#include <pthread.h> -+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h> - void *foo(void *parm) { - return NULL; - } -@@ -1716,10 +1667,7 @@ - if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1); - if (pthread_create(&id, &attr, foo, NULL)) exit(-1); - exit(0); -- }], -- ac_cv_pthread_system_supported=yes, -- ac_cv_pthread_system_supported=no, -- ac_cv_pthread_system_supported=no) -+ }]])],[ac_cv_pthread_system_supported=yes],[ac_cv_pthread_system_supported=no],[ac_cv_pthread_system_supported=no]) - ]) - AC_MSG_RESULT($ac_cv_pthread_system_supported) - if test "$ac_cv_pthread_system_supported" = "yes"; then -@@ -1754,7 +1702,7 @@ - - [ - dnl the check does not work on cross compilation case... -- AC_TRY_RUN([ /* AF_INET6 available check */ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */ - #include <sys/types.h> - #include <sys/socket.h> - main() -@@ -1764,25 +1712,19 @@ - else - exit(0); - } --], -- AC_MSG_RESULT(yes) -- ipv6=yes, -- AC_MSG_RESULT(no) -- ipv6=no, -- AC_MSG_RESULT(no) -+]])],[AC_MSG_RESULT(yes) -+ ipv6=yes],[AC_MSG_RESULT(no) -+ ipv6=no],[AC_MSG_RESULT(no) - ipv6=no --) -+]) - - if test "$ipv6" = "yes"; then - AC_MSG_CHECKING(if RFC2553 API is available) -- AC_TRY_COMPILE([#include <sys/types.h> --#include <netinet/in.h>], -- [struct sockaddr_in6 x; --x.sin6_scope_id;], -- AC_MSG_RESULT(yes) -- ipv6=yes, -- AC_MSG_RESULT(no, IPv6 disabled) -- ipv6=no) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <netinet/in.h>]], [[struct sockaddr_in6 x; -+x.sin6_scope_id;]])],[AC_MSG_RESULT(yes) -+ ipv6=yes],[AC_MSG_RESULT(no, IPv6 disabled) -+ ipv6=no]) - fi - - if test "$ipv6" = "yes"; then -@@ -1905,7 +1847,7 @@ - # Check for universal newline support - AC_MSG_CHECKING(for --with-universal-newlines) - AC_ARG_WITH(universal-newlines, -- AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines)) -+ AS_HELP_STRING(--with(out)-universal-newlines,disable/enable foreign newlines)) - - if test -z "$with_universal_newlines" - then with_universal_newlines="yes" -@@ -1923,7 +1865,7 @@ - # Check for --with-doc-strings - AC_MSG_CHECKING(for --with-doc-strings) - AC_ARG_WITH(doc-strings, -- AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings)) -+ AS_HELP_STRING(--with(out)-doc-strings,disable/enable documentation strings)) - - if test -z "$with_doc_strings" - then with_doc_strings="yes" -@@ -1938,7 +1880,7 @@ - # Check for Python-specific malloc support - AC_MSG_CHECKING(for --with-pymalloc) - AC_ARG_WITH(pymalloc, -- AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs)) -+ AS_HELP_STRING(--with(out)-pymalloc,disable/enable specialized mallocs)) - - if test -z "$with_pymalloc" - then with_pymalloc="yes" -@@ -1953,7 +1895,7 @@ - # Check for --with-wctype-functions - AC_MSG_CHECKING(for --with-wctype-functions) - AC_ARG_WITH(wctype-functions, -- AC_HELP_STRING(--with-wctype-functions, use wctype.h functions), -+ AS_HELP_STRING(--with-wctype-functions,use wctype.h functions), - [ - if test "$withval" != no - then -@@ -1971,7 +1913,7 @@ - - AC_MSG_CHECKING(for --with-sgi-dl) - AC_ARG_WITH(sgi-dl, -- AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking), -+ AS_HELP_STRING(--with-sgi-dl=DIRECTORY,IRIX 4 dynamic linking), - [ - AC_MSG_RESULT($withval) - echo --with-sgi-dl is unsupported, see README -@@ -1993,7 +1935,7 @@ - - AC_MSG_CHECKING(for --with-dl-dld) - AC_ARG_WITH(dl-dld, -- AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking), -+ AS_HELP_STRING(--with-dl-dld=DL_DIR,GNU dynamic linking), - [ - AC_MSG_RESULT($withval) - echo --with-dl-dld is unsupported, see README -@@ -2085,41 +2027,29 @@ - # For some functions, having a definition is not sufficient, since - # we want to take their address. - AC_MSG_CHECKING(for chroot) --AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot, -- AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=chroot]])],[AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for link) --AC_TRY_COMPILE([#include <unistd.h>], void *x=link, -- AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=link]])],[AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for symlink) --AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink, -- AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=symlink]])],[AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fchdir) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir, -- AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fchdir]])],[AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fsync) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync, -- AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fsync]])],[AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fdatasync) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync, -- AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fdatasync]])],[AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # On some systems (eg. FreeBSD 5), we would find a definition of the - # functions ctermid_r, setgroups in the library, but no prototype -@@ -2128,34 +2058,28 @@ - # because of the missing prototypes. - - AC_MSG_CHECKING(for ctermid_r) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <stdio.h> --], void* p = ctermid_r, -- AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = ctermid_r]])],[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for flock) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/file.h> --], void* p = flock, -- AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = flock]])],[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for getpagesize) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <unistd.h> --], void* p = getpagesize, -- AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = getpagesize]])],[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - dnl check for true - AC_CHECK_PROGS(TRUE, true, /bin/true) -@@ -2167,54 +2091,45 @@ - ) - - AC_MSG_CHECKING(for hstrerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <netdb.h> --], void* p = hstrerror; hstrerror(0), -- AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = hstrerror; hstrerror(0)]])],[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for inet_aton) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --], void* p = inet_aton;inet_aton(0,0), -- AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = inet_aton;inet_aton(0,0)]])],[AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for inet_pton) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --], void* p = inet_pton, -- AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = inet_pton]])],[AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # On some systems, setgroups is in unistd.h, on others, in grp.h - AC_MSG_CHECKING(for setgroups) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <unistd.h> - #ifdef HAVE_GRP_H - #include <grp.h> - #endif --], --void* p = setgroups, -- AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = setgroups]])],[AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # check for openpty and forkpty - -@@ -2226,30 +2141,24 @@ - - AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove) - AC_CHECK_FUNCS(getpgrp, -- AC_TRY_COMPILE([#include <unistd.h>], -- [getpgrp(0);], -- AC_DEFINE(GETPGRP_HAVE_ARG, 1, -- [Define if getpgrp() must be called as getpgrp(0).]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[getpgrp(0);]])],[AC_DEFINE(GETPGRP_HAVE_ARG, 1, -+ Define if getpgrp() must be called as getpgrp(0).) -+ ],[]) - ) - AC_CHECK_FUNCS(setpgrp, -- AC_TRY_COMPILE([#include <unistd.h>], -- [setpgrp(0,0);], -- AC_DEFINE(SETPGRP_HAVE_ARG, 1, -- [Define if setpgrp() must be called as setpgrp(0, 0).]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_HAVE_ARG, 1, -+ Define if setpgrp() must be called as setpgrp(0, 0).) -+ ],[]) - ) - AC_CHECK_FUNCS(gettimeofday, -- AC_TRY_COMPILE([#include <sys/time.h>], -- [gettimeofday((struct timeval*)0,(struct timezone*)0);], , -- AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1, -- [Define if gettimeofday() does not have second (timezone) argument -- This is the case on Motorola V4 (R40V4.2)]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],[],[AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1, -+ Define if gettimeofday() does not have second (timezone) argument -+ This is the case on Motorola V4 (R40V4.2)) -+ ]) - ) - - AC_MSG_CHECKING(for major, minor, and makedev) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if defined(MAJOR_IN_MKDEV) - #include <sys/mkdev.h> - #elif defined(MAJOR_IN_SYSMACROS) -@@ -2257,9 +2166,9 @@ - #else - #include <sys/types.h> - #endif --],[ -+]], [[ - makedev(major(0),minor(0)); --],[ -+]])],[ - AC_DEFINE(HAVE_DEVICE_MACROS, 1, - [Define to 1 if you have the device macros.]) - AC_MSG_RESULT(yes) -@@ -2270,14 +2179,14 @@ - # On OSF/1 V5.1, getaddrinfo is available, but a define - # for [no]getaddrinfo in netdb.h. - AC_MSG_CHECKING(for getaddrinfo) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <sys/socket.h> - #include <netdb.h> - #include <stdio.h> --],[ -+]], [[ - getaddrinfo(NULL, NULL, NULL, NULL); --], [ -+]])],[ - AC_MSG_RESULT(yes) - AC_MSG_CHECKING(getaddrinfo bug) - AC_TRY_RUN([ -@@ -2371,7 +2280,7 @@ - AC_MSG_RESULT(buggy) - buggygetaddrinfo=yes, - AC_MSG_RESULT(buggy) --buggygetaddrinfo=yes)], [ -+buggygetaddrinfo=yes)],[ - AC_MSG_RESULT(no) - buggygetaddrinfo=yes - ]) -@@ -2397,9 +2306,7 @@ - - AC_MSG_CHECKING(for time.h that defines altzone) - AC_CACHE_VAL(ac_cv_header_time_altzone, --[AC_TRY_COMPILE([#include <time.h>], [return altzone;], -- ac_cv_header_time_altzone=yes, -- ac_cv_header_time_altzone=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],[ac_cv_header_time_altzone=yes],[ac_cv_header_time_altzone=no])]) - AC_MSG_RESULT($ac_cv_header_time_altzone) - if test $ac_cv_header_time_altzone = yes; then - AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.]) -@@ -2407,25 +2314,22 @@ - - was_it_defined=no - AC_MSG_CHECKING(whether sys/select.h and sys/time.h may both be included) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <sys/select.h> - #include <sys/time.h> --], [;], [ -+]], [[;]])],[ - AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1, - [Define if you can safely include both <sys/select.h> and <sys/time.h> - (which you can't on SCO ODT 3.0).]) - was_it_defined=yes --]) -+],[]) - AC_MSG_RESULT($was_it_defined) - - AC_MSG_CHECKING(for addrinfo) - AC_CACHE_VAL(ac_cv_struct_addrinfo, --AC_TRY_COMPILE([ --# include <netdb.h>], -- [struct addrinfo a], -- ac_cv_struct_addrinfo=yes, -- ac_cv_struct_addrinfo=no)) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+# include <netdb.h>]], [[struct addrinfo a]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no])) - AC_MSG_RESULT($ac_cv_struct_addrinfo) - if test $ac_cv_struct_addrinfo = yes; then - AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)]) -@@ -2433,12 +2337,9 @@ - - AC_MSG_CHECKING(for sockaddr_storage) - AC_CACHE_VAL(ac_cv_struct_sockaddr_storage, --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # include <sys/types.h> --# include <sys/socket.h>], -- [struct sockaddr_storage s], -- ac_cv_struct_sockaddr_storage=yes, -- ac_cv_struct_sockaddr_storage=no)) -+# include <sys/socket.h>]], [[struct sockaddr_storage s]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no])) - AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) - if test $ac_cv_struct_sockaddr_storage = yes; then - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) -@@ -2451,30 +2352,28 @@ - - works=no - AC_MSG_CHECKING(for working volatile) --AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes, -- AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.]) --) -+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.) -+]) - AC_MSG_RESULT($works) - - works=no - AC_MSG_CHECKING(for working signed char) --AC_TRY_COMPILE([], [signed char c;], works=yes, -- AC_DEFINE(signed, [], [Define to empty if the keyword does not work.]) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])],[works=yes],[AC_DEFINE(signed, , Define to empty if the keyword does not work.) -+]) - AC_MSG_RESULT($works) - - have_prototypes=no - AC_MSG_CHECKING(for prototypes) --AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])],[ - AC_DEFINE(HAVE_PROTOTYPES, 1, - [Define if your compiler supports function prototype]) - have_prototypes=yes --]) -+],[]) - AC_MSG_RESULT($have_prototypes) - - works=no - AC_MSG_CHECKING(for variable length prototypes and stdarg.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stdarg.h> - int foo(int x, ...) { - va_list va; -@@ -2484,45 +2383,41 @@ - va_arg(va, double); - return 0; - } --], [return foo(10, "", 3.14);], [ -+]], [[return foo(10, "", 3.14);]])],[ - AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1, - [Define if your compiler supports variable length function prototypes - (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>]) - works=yes --]) -+],[]) - AC_MSG_RESULT($works) - - if test "$have_prototypes" = yes; then - bad_prototypes=no - AC_MSG_CHECKING(for bad exec* prototypes) --AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], , -- AC_DEFINE(BAD_EXEC_PROTOTYPES, 1, -- [Define if your <unistd.h> contains bad prototypes for exec*() -- (as it does on SGI IRIX 4.x)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[char **t;execve("@",t,t);]])],[],[AC_DEFINE(BAD_EXEC_PROTOTYPES, 1, -+ Define if your <unistd.h> contains bad prototypes for exec*() -+ (as it does on SGI IRIX 4.x)) - bad_prototypes=yes --) -+]) - AC_MSG_RESULT($bad_prototypes) - fi - - # check if sockaddr has sa_len member - AC_MSG_CHECKING(if sockaddr has sa_len member) --AC_TRY_COMPILE([#include <sys/types.h> --#include <sys/socket.h>], --[struct sockaddr x; --x.sa_len = 0;], -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]), -- AC_MSG_RESULT(no)) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <sys/socket.h>]], [[struct sockaddr x; -+x.sa_len = 0;]])],[AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, Define if sockaddr has sa_len member)],[AC_MSG_RESULT(no)]) - - va_list_is_array=no - AC_MSG_CHECKING(whether va_list is an array) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_STDARG_PROTOTYPES - #include <stdarg.h> - #else - #include <varargs.h> - #endif --], [va_list list1, list2; list1 = list2;], , [ -+]], [[va_list list1, list2; list1 = list2;]])],[],[ - AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) - va_list_is_array=yes - ]) -@@ -2537,9 +2432,9 @@ - AC_MSG_CHECKING([gethostbyname_r with 6 args]) - OLD_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" -- AC_TRY_COMPILE([ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # include <netdb.h> -- ], [ -+ ]], [[ - char *name; - struct hostent *he, *res; - char buffer[2048]; -@@ -2547,12 +2442,12 @@ - int h_errnop; - - (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop) -- ], [ -+ ]])],[ - AC_DEFINE(HAVE_GETHOSTBYNAME_R) - AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1, - [Define this if you have the 6-arg version of gethostbyname_r().]) - AC_MSG_RESULT(yes) -- ], [ -+ ],[ - AC_MSG_RESULT(no) - AC_MSG_CHECKING([gethostbyname_r with 5 args]) - AC_TRY_COMPILE([ -@@ -2613,7 +2508,7 @@ - # Check for --with-fpectl - AC_MSG_CHECKING(for --with-fpectl) - AC_ARG_WITH(fpectl, -- AC_HELP_STRING(--with-fpectl, enable SIGFPE catching), -+ AS_HELP_STRING(--with-fpectl,enable SIGFPE catching), - [ - if test "$withval" != no - then -@@ -2633,7 +2528,7 @@ - esac - AC_MSG_CHECKING(for --with-libm=STRING) - AC_ARG_WITH(libm, -- AC_HELP_STRING(--with-libm=STRING, math library), -+ AS_HELP_STRING(--with-libm=STRING,math library), - [ - if test "$withval" = no - then LIBM= -@@ -2649,7 +2544,7 @@ - AC_SUBST(LIBC) - AC_MSG_CHECKING(for --with-libc=STRING) - AC_ARG_WITH(libc, -- AC_HELP_STRING(--with-libc=STRING, C library), -+ AS_HELP_STRING(--with-libc=STRING,C library), - [ - if test "$withval" = no - then LIBC= -@@ -2684,20 +2579,20 @@ - - AC_MSG_CHECKING(for UCS-4 tcl) - have_ucs4_tcl=no --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <tcl.h> - #if TCL_UTF_MAX != 6 - # error "NOT UCS4_TCL" --#endif], [], [ -+#endif]], [[]])],[ - AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6]) - have_ucs4_tcl=yes --]) -+],[]) - AC_MSG_RESULT($have_ucs4_tcl) - - AC_MSG_CHECKING(what type to use for unicode) - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_ENABLE(unicode, -- AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)), -+ AS_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@,Enable Unicode strings (default is yes)), - [], - [enable_unicode=yes]) - -@@ -2764,15 +2659,12 @@ - # or fills with zeros (like the Cray J90, according to Tim Peters). - AC_MSG_CHECKING(whether right shift extends the sign bit) - AC_CACHE_VAL(ac_cv_rshift_extends_sign, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - int main() - { - exit(((-1)>>3 == -1) ? 0 : 1); - } --], --ac_cv_rshift_extends_sign=yes, --ac_cv_rshift_extends_sign=no, --ac_cv_rshift_extends_sign=yes)]) -+]])],[ac_cv_rshift_extends_sign=yes],[ac_cv_rshift_extends_sign=no],[ac_cv_rshift_extends_sign=yes])]) - AC_MSG_RESULT($ac_cv_rshift_extends_sign) - if test "$ac_cv_rshift_extends_sign" = no - then -@@ -2784,12 +2676,12 @@ - # check for getc_unlocked and related locking functions - AC_MSG_CHECKING(for getc_unlocked() and friends) - AC_CACHE_VAL(ac_cv_have_getc_unlocked, [ --AC_TRY_LINK([#include <stdio.h>],[ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[ - FILE *f = fopen("/dev/null", "r"); - flockfile(f); - getc_unlocked(f); - funlockfile(f); --], ac_cv_have_getc_unlocked=yes, ac_cv_have_getc_unlocked=no)]) -+]])],[ac_cv_have_getc_unlocked=yes],[ac_cv_have_getc_unlocked=no])]) - AC_MSG_RESULT($ac_cv_have_getc_unlocked) - if test "$ac_cv_have_getc_unlocked" = yes - then -@@ -2798,8 +2690,7 @@ - fi - - # check for readline 2.2 --AC_TRY_CPP([#include <readline/readline.h>], --have_readline=yes, have_readline=no) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <readline/readline.h>]])],[have_readline=yes],[have_readline=no]) - if test $have_readline = yes - then - AC_EGREP_HEADER([extern int rl_completion_append_character;], -@@ -2820,7 +2711,7 @@ - - AC_MSG_CHECKING(for broken nice()) - AC_CACHE_VAL(ac_cv_broken_nice, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - int main() - { - int val1 = nice(1); -@@ -2828,10 +2719,7 @@ - exit(0); - exit(1); - } --], --ac_cv_broken_nice=yes, --ac_cv_broken_nice=no, --ac_cv_broken_nice=no)]) -+]])],[ac_cv_broken_nice=yes],[ac_cv_broken_nice=no],[ac_cv_broken_nice=no])]) - AC_MSG_RESULT($ac_cv_broken_nice) - if test "$ac_cv_broken_nice" = yes - then -@@ -2842,7 +2730,7 @@ - # tzset(3) exists and works like we expect it to - AC_MSG_CHECKING(for working tzset()) - AC_CACHE_VAL(ac_cv_working_tzset, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdlib.h> - #include <time.h> - #include <string.h> -@@ -2880,10 +2768,7 @@ - - exit(0); - } --], --ac_cv_working_tzset=yes, --ac_cv_working_tzset=no, --ac_cv_working_tzset=no)]) -+]])],[ac_cv_working_tzset=yes],[ac_cv_working_tzset=no],[ac_cv_working_tzset=no])]) - AC_MSG_RESULT($ac_cv_working_tzset) - if test "$ac_cv_working_tzset" = yes - then -@@ -2894,13 +2779,10 @@ - # Look for subsecond timestamps in struct stat - AC_MSG_CHECKING(for tv_nsec in struct stat) - AC_CACHE_VAL(ac_cv_stat_tv_nsec, --AC_TRY_COMPILE([#include <sys/stat.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[ - struct stat st; - st.st_mtim.tv_nsec = 1; --], --ac_cv_stat_tv_nsec=yes, --ac_cv_stat_tv_nsec=no, --ac_cv_stat_tv_nsec=no)) -+]])],[ac_cv_stat_tv_nsec=yes],[ac_cv_stat_tv_nsec=no])) - AC_MSG_RESULT($ac_cv_stat_tv_nsec) - if test "$ac_cv_stat_tv_nsec" = yes - then -@@ -2911,12 +2793,10 @@ - # On HP/UX 11.0, mvwdelch is a block with a return statement - AC_MSG_CHECKING(whether mvwdelch is an expression) - AC_CACHE_VAL(ac_cv_mvwdelch_is_expression, --AC_TRY_COMPILE([#include <curses.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ - int rtn; - rtn = mvwdelch(0,0,0); --], ac_cv_mvwdelch_is_expression=yes, -- ac_cv_mvwdelch_is_expression=no, -- ac_cv_mvwdelch_is_expression=yes)) -+]])],[ac_cv_mvwdelch_is_expression=yes],[ac_cv_mvwdelch_is_expression=no])) - AC_MSG_RESULT($ac_cv_mvwdelch_is_expression) - - if test "$ac_cv_mvwdelch_is_expression" = yes -@@ -2927,12 +2807,10 @@ - - AC_MSG_CHECKING(whether WINDOW has _flags) - AC_CACHE_VAL(ac_cv_window_has_flags, --AC_TRY_COMPILE([#include <curses.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ - WINDOW *w; - w->_flags = 0; --], ac_cv_window_has_flags=yes, -- ac_cv_window_has_flags=no, -- ac_cv_window_has_flags=no)) -+]])],[ac_cv_window_has_flags=yes],[ac_cv_window_has_flags=no])) - AC_MSG_RESULT($ac_cv_window_has_flags) - - 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 @@ +######################################################################################################################## +### 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 +### +### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy +### +### Warning: Manual edits will be lost! +### +######################################################################################################################## + + +PROVIDES+="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 " + +PACKAGES="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 " + +DESCRIPTION_python-profile="Python Basic Profiling Support" +PR_python-profile="ml1" +RDEPENDS_python-profile="python-core" +FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " + +DESCRIPTION_python-threading="Python Threading & Synchronization Support" +PR_python-threading="ml1" +RDEPENDS_python-threading="python-core python-lang" +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.* " + +DESCRIPTION_python-distutils="Python Distribution Utilities" +PR_python-distutils="ml1" +RDEPENDS_python-distutils="python-core" +FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " + +DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" +PR_python-textutils="ml1" +RDEPENDS_python-textutils="python-core python-io python-re python-stringold" +FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " + +DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" +PR_python-codecs="ml1" +RDEPENDS_python-codecs="python-core" +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.* " + +DESCRIPTION_python-pickle="Python Persistence Support" +PR_python-pickle="ml1" +RDEPENDS_python-pickle="python-core python-codecs python-io python-re" +FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " + +DESCRIPTION_python-datetime="Python Calendar and Time support" +PR_python-datetime="ml1" +RDEPENDS_python-datetime="python-core python-codecs" +FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " + +DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" +PR_python-core="ml3" +RDEPENDS_python-core="" +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/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* " + +DESCRIPTION_python-io="Python Low-Level I/O" +PR_python-io="ml1" +RDEPENDS_python-io="python-core python-math" +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.* " + +DESCRIPTION_python-compiler="Python Compiler Support" +PR_python-compiler="ml1" +RDEPENDS_python-compiler="python-core" +FILES_python-compiler="${libdir}/python2.5/compiler " + +DESCRIPTION_python-compression="Python High Level Compression Support" +PR_python-compression="ml1" +RDEPENDS_python-compression="python-core python-zlib" +FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " + +DESCRIPTION_python-re="Python Regular Expression APIs" +PR_python-re="ml1" +RDEPENDS_python-re="python-core" +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.* " + +DESCRIPTION_python-xmlrpc="Python XMLRPC Support" +PR_python-xmlrpc="ml1" +RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" +FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " + +DESCRIPTION_python-terminal="Python Terminal Controlling Support" +PR_python-terminal="ml1" +RDEPENDS_python-terminal="python-core python-io" +FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " + +DESCRIPTION_python-email="Python Email Support" +PR_python-email="ml1" +RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" +FILES_python-email="${libdir}/python2.5/email " + +DESCRIPTION_python-image="Python Graphical Image Handling" +PR_python-image="ml1" +RDEPENDS_python-image="python-core" +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 " + +DESCRIPTION_python-core-dbg="Python core module debug information" +PR_python-core-dbg="ml1" +RDEPENDS_python-core-dbg="python-core" +FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " + +DESCRIPTION_python-resource="Python Resource Control Interface" +PR_python-resource="ml1" +RDEPENDS_python-resource="python-core" +FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " + +DESCRIPTION_python-devel="Python Development Package" +PR_python-devel="ml1" +RDEPENDS_python-devel="python-core" +FILES_python-devel="${includedir} ${libdir}/python2.5/config " + +DESCRIPTION_python-math="Python Math Support" +PR_python-math="ml1" +RDEPENDS_python-math="python-core" +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.* " + +DESCRIPTION_python-hotshot="Python Hotshot Profiler" +PR_python-hotshot="ml1" +RDEPENDS_python-hotshot="python-core" +FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " + +DESCRIPTION_python-unixadmin="Python Unix Administration Support" +PR_python-unixadmin="ml1" +RDEPENDS_python-unixadmin="python-core" +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.* " + +DESCRIPTION_python-syslog="Python's syslog Interface" +PR_python-syslog="ml1" +RDEPENDS_python-syslog="python-core" +FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " + +DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" +PR_python-tkinter="ml1" +RDEPENDS_python-tkinter="python-core" +FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " + +DESCRIPTION_python-gdbm="Python GNU Database Support" +PR_python-gdbm="ml1" +RDEPENDS_python-gdbm="python-core" +FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " + +DESCRIPTION_python-fcntl="Python's fcntl Interface" +PR_python-fcntl="ml1" +RDEPENDS_python-fcntl="python-core" +FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " + +DESCRIPTION_python-netclient="Python Internet Protocol Clients" +PR_python-netclient="ml2" +RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold" +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.* " + +DESCRIPTION_python-pprint="Python Pretty-Print Support" +PR_python-pprint="ml1" +RDEPENDS_python-pprint="python-core" +FILES_python-pprint="${libdir}/python2.5/pprint.* " + +DESCRIPTION_python-netserver="Python Internet Protocol Servers" +PR_python-netserver="ml1" +RDEPENDS_python-netserver="python-core python-netclient" +FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " + +DESCRIPTION_python-curses="Python Curses Support" +PR_python-curses="ml1" +RDEPENDS_python-curses="python-core" +FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " + +DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" +PR_python-smtpd="ml1" +RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" +FILES_python-smtpd="${bindir}/smtpd.* " + +DESCRIPTION_python-html="Python HTML Processing" +PR_python-html="ml1" +RDEPENDS_python-html="python-core" +FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " + +DESCRIPTION_python-readline="Python Readline Support" +PR_python-readline="ml1" +RDEPENDS_python-readline="python-core" +FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " + +DESCRIPTION_python-subprocess="Python Subprocess Support" +PR_python-subprocess="ml1" +RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" +FILES_python-subprocess="${libdir}/python2.5/subprocess.* " + +DESCRIPTION_python-pydoc="Python Interactive Help Support" +PR_python-pydoc="ml1" +RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" +FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " + +DESCRIPTION_python-logging="Python Logging Support" +PR_python-logging="ml1" +RDEPENDS_python-logging="python-core" +FILES_python-logging="${libdir}/python2.5/logging " + +DESCRIPTION_python-mailbox="Python Mailbox Format Support" +PR_python-mailbox="ml1" +RDEPENDS_python-mailbox="python-core python-mime" +FILES_python-mailbox="${libdir}/python2.5/mailbox.* " + +DESCRIPTION_python-xml="Python basic XML support." +PR_python-xml="ml2" +RDEPENDS_python-xml="python-core python-re python-netclient" +FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " + +DESCRIPTION_python-mime="Python MIME Handling APIs" +PR_python-mime="ml1" +RDEPENDS_python-mime="python-core python-io" +FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " + +DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" +PR_python-sqlite3="ml1" +RDEPENDS_python-sqlite3="python-core" +FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " + +DESCRIPTION_python-tests="Python Tests" +PR_python-tests="ml1" +RDEPENDS_python-tests="python-core" +FILES_python-tests="${libdir}/python2.5/test " + +DESCRIPTION_python-unittest="Python Unit Testing Framework" +PR_python-unittest="ml1" +RDEPENDS_python-unittest="python-core python-stringold python-lang" +FILES_python-unittest="${libdir}/python2.5/unittest.* " + +DESCRIPTION_python-stringold="Python String APIs [deprecated]" +PR_python-stringold="ml1" +RDEPENDS_python-stringold="python-core python-re" +FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " + +DESCRIPTION_python-robotparser="Python robots.txt parser" +PR_python-robotparser="ml1" +RDEPENDS_python-robotparser="python-core python-netclient" +FILES_python-robotparser="${libdir}/python2.5/robotparser.* " + +DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" +PR_python-lib-old-and-deprecated="ml1" +RDEPENDS_python-lib-old-and-deprecated="python-core" +FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " + +DESCRIPTION_python-compile="Python Bytecode Compilation Support" +PR_python-compile="ml1" +RDEPENDS_python-compile="python-core" +FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " + +DESCRIPTION_python-debugger="Python Debugger" +PR_python-debugger="ml1" +RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" +FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " + +DESCRIPTION_python-shell="Python Shell-Like Functionality" +PR_python-shell="ml1" +RDEPENDS_python-shell="python-core python-re" +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.* " + +DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" +PR_python-bsddb="ml1" +RDEPENDS_python-bsddb="python-core" +FILES_python-bsddb="${libdir}/python2.5/bsddb " + +DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" +PR_python-mmap="ml1" +RDEPENDS_python-mmap="python-core python-io" +FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " + +DESCRIPTION_python-zlib="Python zlib Support." +PR_python-zlib="ml1" +RDEPENDS_python-zlib="python-core" +FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " + +DESCRIPTION_python-db="Python File-Based Database Support" +PR_python-db="ml1" +RDEPENDS_python-db="python-core" +FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " + +DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" +PR_python-crypt="ml1" +RDEPENDS_python-crypt="python-core" +FILES_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 " + +DESCRIPTION_python-idle="Python Integrated Development Environment" +PR_python-idle="ml1" +RDEPENDS_python-idle="python-core python-tkinter" +FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " + +DESCRIPTION_python-lang="Python Low-Level Language Support" +PR_python-lang="ml1" +RDEPENDS_python-lang="python-core" +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.* " + +DESCRIPTION_python-audio="Python Audio Handling" +PR_python-audio="ml1" +RDEPENDS_python-audio="python-core" +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 " + + + 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 @@ +# +# FIXME: Don't simply rip this test out... add getting it from cache +# +Index: Python-2.5.1/configure.in +=================================================================== +--- Python-2.5.1.orig/configure.in ++++ Python-2.5.1/configure.in +@@ -3367,41 +3367,6 @@ else + AC_MSG_RESULT(no) + fi + +-AC_MSG_CHECKING(for %zd printf() format support) +-AC_TRY_RUN([#include <stdio.h> +-#include <stddef.h> +-#include <string.h> +- +-int main() +-{ +- char buffer[256]; +- +-#ifdef HAVE_SSIZE_T +-typedef ssize_t Py_ssize_t; +-#elif SIZEOF_VOID_P == SIZEOF_LONG +-typedef long Py_ssize_t; +-#else +-typedef int Py_ssize_t; +-#endif +- +- if(sprintf(buffer, "%zd", (size_t)123) < 0) +- return 1; +- +- if (strcmp(buffer, "123")) +- return 1; +- +- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) +- return 1; +- +- if (strcmp(buffer, "-123")) +- return 1; +- +- return 0; +-}], +-[AC_MSG_RESULT(yes) +- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], +- AC_MSG_RESULT(no)) +- + AC_CHECK_TYPE(socklen_t,, + AC_DEFINE(socklen_t,int, + 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 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- Python-2.4c1/Makefile.pre.in~bindir-libdir.patch -+++ Python-2.4c1/Makefile.pre.in -@@ -78,8 +78,8 @@ +Index: Python-2.5.1/Makefile.pre.in +=================================================================== +--- Python-2.5.1.orig/Makefile.pre.in ++++ Python-2.5.1/Makefile.pre.in +@@ -83,8 +83,8 @@ prefix= @prefix@ exec_prefix= @exec_prefix@ # 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 @@ - # -# Patch managed by http://www.holgerschurig.de/patcher.html +# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> # - ---- Python-2.4c1/Makefile.pre.in~crosscompile -+++ Python-2.4c1/Makefile.pre.in -@@ -162,6 +162,7 @@ +Index: Python-2.5.1/Makefile.pre.in +=================================================================== +--- Python-2.5.1.orig/Makefile.pre.in ++++ Python-2.5.1/Makefile.pre.in +@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) @@ -13,7 +13,7 @@ # === Definitions added by makesetup === -@@ -188,7 +189,7 @@ +@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar ########################################################################## # Parser PGEN= Parser/pgen$(EXE) @@ -22,7 +22,7 @@ POBJS= \ Parser/acceler.o \ Parser/grammar1.o \ -@@ -320,8 +321,8 @@ +@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON) # Build the shared modules sharedmods: $(BUILDPYTHON) case $$MAKEFLAGS in \ @@ -32,8 +32,8 @@ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ esac - # buildno should really depend on something like LIBRARY_SRC -@@ -442,7 +443,7 @@ + # Build static library +@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) @@ -42,19 +42,19 @@ $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -718,19 +719,19 @@ +@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib done $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ @@ -66,7 +66,7 @@ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -@@ -825,7 +826,7 @@ +@@ -885,7 +886,7 @@ libainstall: all # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: @@ -75,9 +75,11 @@ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ ---- Python-2.4c1/setup.py~crosscompile -+++ Python-2.4c1/setup.py -@@ -206,6 +206,7 @@ +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): except ImportError, why: self.announce('*** WARNING: renaming "%s" since importing it' ' failed: %s' % (ext.name, why), level=3) @@ -85,7 +87,7 @@ assert not self.inplace basename, tail = os.path.splitext(ext_filename) newname = basename + "_failed" + tail -@@ -239,8 +240,8 @@ +@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used @@ -94,9 +96,9 @@ + # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # Add paths to popular package managers on OS X/darwin - if sys.platform == "darwin": -@@ -293,6 +294,9 @@ + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -341,6 +342,9 @@ class PyBuildExt(build_ext): # XXX Omitted modules: gl, pure, dl, SGI-specific modules 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 @@ +Index: Python-2.5.1/Python/compile.c +=================================================================== +--- Python-2.5.1.orig/Python/compile.c ++++ Python-2.5.1/Python/compile.c +@@ -30,7 +30,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + /* + 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 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- Python-2.4.1/setup.py~fix-tkinter-detection -+++ Python-2.4.1/setup.py -@@ -999,7 +999,7 @@ +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): dotversion = dotversion[:-1] + '.' + dotversion[-1] tcl_include_sub = [] tk_include_sub = [] @@ -14,7 +16,7 @@ tcl_include_sub += [dir + os.sep + "tcl" + dotversion] tk_include_sub += [dir + os.sep + "tk" + dotversion] tk_include_sub += tcl_include_sub -@@ -1018,22 +1018,6 @@ +@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): if dir not in include_dirs: include_dirs.append(dir) 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 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- Python-2.4.3/Lib/site.py~sitebranding -+++ Python-2.4.3/Lib/site.py -@@ -305,8 +305,9 @@ +Index: Python-2.5.1/Lib/site.py +=================================================================== +--- Python-2.5.1.orig/Lib/site.py ++++ Python-2.5.1/Lib/site.py +@@ -323,8 +323,9 @@ def setcopyright(): "Jython is maintained by the Jython developers (www.jython.org).") else: __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 @@ # python_build: (Boolean) if true, we're either building Python or # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ +@@ -192,7 +192,7 @@ else: # The name of the config.h file changed in 2.2 config_h = 'pyconfig.h' - return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" + return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) def get_makefile_filename(): -@@ -200,7 +201,8 @@ +@@ -200,7 +200,7 @@ if python_build: return os.path.join(os.path.dirname(sys.executable), "Makefile") lib_dir = get_python_lib(plat_specific=1, standard_lib=1) - return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" + return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) 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 @@ +Index: Python-2.5.1/Python/compile.c +=================================================================== +--- Python-2.5.1.orig/Python/compile.c ++++ Python-2.5.1/Python/compile.c +@@ -30,7 +30,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + /* + 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 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + 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 @@ +DESCRIPTION = "The Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "" +PR = "ml1" + +EXCLUDE_FROM_WORLD = "1" + +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1 \ + file://default-is-optimized.patch;patch=1" +S = "${WORKDIR}/Python-${PV}" + +inherit autotools native + +prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions" +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' + +#do_configure() { +# # the autofoo stuff is too old to allow regenerating +# oe_runconf +#} + +do_stage_append() { + install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ +} 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 @@ +DESCRIPTION = "Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "python-native readline zlib gdbm openssl sqlite3" +DEPENDS_sharprom = "python-native readline zlib gdbm openssl" + +# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py +PR = "ml1" + +PYTHON_MAJMIN = "2.5" + +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ + file://fix-tkinter-detection.patch;patch=1 \ + file://autohell.patch;patch=1 \ + file://sitebranding.patch;patch=1 \ + file://default-is-optimized.patch;patch=1" +S = "${WORKDIR}/Python-${PV}" + +inherit autotools + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions \ + --enable-shared" + +# +# copy config.h and an appropriate Makefile for distutils.sysconfig +# which laters uses the information out of these to compile extensions +# +do_compile_prepend() { + install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ + install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -m 0644 Makefile Makefile.orig + install -m 0644 Makefile Makefile.backup + sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile Makefile.backup + sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ +} + +do_compile() { + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" libpython2.5.so + + oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" +} + +do_stage() { + install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} +} + +do_install() { + install -m 0644 Makefile.orig Makefile + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + DESTDIR=${D} LIBDIR=${libdir} install +} + +require python-${PYTHON_MAJMIN}-manifest.inc + +RPROVIDES_python-core = "python" +RPROVIDES_python-curses = "python" + +PACKAGES =+ "libpython2" +FILES_libpython2 = "${libdir}/libpython*" + +# catch debug extensions +FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" + +# catch all the rest (unsorted) +PACKAGES += "python-misc" +FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" + +# catch manpage +PACKAGES += "python-man" +FILES_python-man = "${datadir}/man" + |