diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/python | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/python')
47 files changed, 2070 insertions, 4 deletions
diff --git a/packages/python/.mtn2git_empty b/packages/python/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/.mtn2git_empty diff --git a/packages/python/python-2.3.4/.mtn2git_empty b/packages/python/python-2.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-2.3.4/.mtn2git_empty diff --git a/packages/python/python-2.3.4/autohell.patch b/packages/python/python-2.3.4/autohell.patch index 2b3f5252ad..b0eebb9ce8 100644 --- a/packages/python/python-2.3.4/autohell.patch +++ b/packages/python/python-2.3.4/autohell.patch @@ -16,7 +16,7 @@ @@ -4,8 +4,8 @@ m4_define(PYTHON_VERSION, 2.3) - AC_REVISION($Revision$) + AC_REVISION($Revision: 1.427.4.10 $) -AC_PREREQ(2.53) -AC_INIT(python, PYTHON_VERSION) +AC_PREREQ(2.59) diff --git a/packages/python/python-2.4.1/.mtn2git_empty b/packages/python/python-2.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-2.4.1/.mtn2git_empty diff --git a/packages/python/python-2.4.1/autohell.patch b/packages/python/python-2.4.1/autohell.patch index e69de29bb2..b0eebb9ce8 100644 --- a/packages/python/python-2.4.1/autohell.patch +++ b/packages/python/python-2.4.1/autohell.patch @@ -0,0 +1,1209 @@ +--- 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/packages/python/python-2.4.1/bindir-libdir.patch b/packages/python/python-2.4.1/bindir-libdir.patch index e69de29bb2..27ae5dce5b 100644 --- a/packages/python/python-2.4.1/bindir-libdir.patch +++ b/packages/python/python-2.4.1/bindir-libdir.patch @@ -0,0 +1,18 @@ + +# +# 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 @@ + exec_prefix= @exec_prefix@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-2.4.1/crosscompile.patch b/packages/python/python-2.4.1/crosscompile.patch index e69de29bb2..f917bb2567 100644 --- a/packages/python/python-2.4.1/crosscompile.patch +++ b/packages/python/python-2.4.1/crosscompile.patch @@ -0,0 +1,108 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Python-2.4c1/Makefile.pre.in~crosscompile ++++ Python-2.4c1/Makefile.pre.in +@@ -162,6 +162,7 @@ + + PYTHON= python$(EXE) + BUILDPYTHON= python$(BUILDEXE) ++HOSTPYTHON= $(BUILDPYTHON) + + # === Definitions added by makesetup === + +@@ -188,7 +189,7 @@ + ########################################################################## + # Parser + PGEN= Parser/pgen$(EXE) +- ++HOSTPGEN= $(PGEN)$(EXE) + POBJS= \ + Parser/acceler.o \ + Parser/grammar1.o \ +@@ -320,8 +321,8 @@ + # Build the shared modules + sharedmods: $(BUILDPYTHON) + case $$MAKEFLAGS in \ +- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *) $(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 @@ + + + $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) +- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) +@@ -718,19 +719,19 @@ + 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) + 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) + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + +@@ -825,7 +826,7 @@ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +--- Python-2.4c1/setup.py~crosscompile ++++ Python-2.4c1/setup.py +@@ -206,6 +206,7 @@ + except ImportError, why: + self.announce('*** WARNING: renaming "%s" since importing it' + ' failed: %s' % (ext.name, why), level=3) ++ return + assert not self.inplace + basename, tail = os.path.splitext(ext_filename) + newname = basename + "_failed" + tail +@@ -239,8 +240,8 @@ + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # 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 @@ + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules + ++ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] ++ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] ++ + # + # The following modules are all pretty straightforward, and compile + # on pretty much any POSIXish platform. diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-dbus/.mtn2git_empty diff --git a/packages/python/python-dbus/cross.patch b/packages/python/python-dbus/cross.patch index e69de29bb2..6d1d9d8e7e 100644 --- a/packages/python/python-dbus/cross.patch +++ b/packages/python/python-dbus/cross.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dbus-0.20/configure.in~cross ++++ dbus-0.20/configure.in +@@ -466,6 +466,7 @@ + exit (0); + ]])], + [have_abstract_sockets=yes], ++ [have_abstract_sockets=no], + [have_abstract_sockets=no]) + AC_LANG_POP(C) + AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/python/python-dbus/gettext.patch b/packages/python/python-dbus/gettext.patch index e69de29bb2..7042bd0903 100644 --- a/packages/python/python-dbus/gettext.patch +++ b/packages/python/python-dbus/gettext.patch @@ -0,0 +1,164 @@ +Index: dbus-0.23/configure.in +=================================================================== +--- dbus-0.23.orig/configure.in 2005-04-02 17:14:37.780040976 -0500 ++++ dbus-0.23/configure.in 2005-04-02 17:14:38.024003888 -0500 +@@ -22,6 +22,9 @@ + AC_ISC_POSIX + AC_HEADER_STDC + ++AM_GNU_GETTEXT_VERSION(0.11.5) ++AM_GNU_GETTEXT([external], [need-ngettext]) ++ + AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto) + AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto) + AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto) +Index: dbus-0.23/glib/Makefile.am +=================================================================== +--- dbus-0.23.orig/glib/Makefile.am 2004-07-29 04:00:45.000000000 -0400 ++++ dbus-0.23/glib/Makefile.am 2005-04-02 17:22:27.302662688 -0500 +@@ -15,7 +15,7 @@ + dbus-gvalue.c \ + dbus-gvalue.h + +-libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la ++libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(LIBINTL) $(top_builddir)/dbus/libdbus-1.la + ## don't export symbols that start with "_" (we use this + ## convention for internal symbols) + libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" +Index: dbus-0.23/glib/dbus-glib-tool.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-glib-tool.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-glib-tool.c 2005-04-02 17:14:38.024003888 -0500 +@@ -26,8 +26,13 @@ + #include "dbus-gparser.h" + #include "dbus-gutils.h" + #include <locale.h> ++ ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + #include <stdio.h> + #include <stdlib.h> +Index: dbus-0.23/glib/dbus-glib.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-glib.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-glib.c 2005-04-02 17:14:38.024003888 -0500 +@@ -27,8 +27,12 @@ + #include "dbus-gtest.h" + #include "dbus-gutils.h" + ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + /** +Index: dbus-0.23/glib/dbus-gmain.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-gmain.c 2004-11-13 02:07:47.000000000 -0500 ++++ dbus-0.23/glib/dbus-gmain.c 2005-04-02 17:14:38.025003736 -0500 +@@ -27,8 +27,12 @@ + #include "dbus-gtest.h" + #include "dbus-gutils.h" + ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + /** +Index: dbus-0.23/glib/dbus-gparser.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-gparser.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-gparser.c 2005-04-02 17:14:38.025003736 -0500 +@@ -20,12 +20,18 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ ++ ++#include <config.h> + #include "dbus-gparser.h" + #include "dbus-gidl.h" + #include <string.h> + ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) gettext ((x)) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + #ifndef DOXYGEN_SHOULD_SKIP_THIS +Index: dbus-0.23/tools/Makefile.am +=================================================================== +--- dbus-0.23.orig/tools/Makefile.am 2004-04-21 17:29:07.000000000 -0400 ++++ dbus-0.23/tools/Makefile.am 2005-04-02 17:22:00.712704976 -0500 +@@ -37,8 +37,8 @@ + + dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la + dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la +-dbus_launch_LDADD= $(DBUS_X_LIBS) +-dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) ++dbus_launch_LDADD= $(DBUS_X_LIBS) $(LIBINTL) ++dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(LIBINTL) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) + + man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 + EXTRA_DIST = $(man_MANS) +Index: dbus-0.23/tools/dbus-launch.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-launch.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-launch.c 2005-04-02 17:14:38.026003584 -0500 +@@ -22,6 +22,8 @@ + */ + #include <config.h> + #include <stdlib.h> ++#include <sys/time.h> ++#include <sys/types.h> + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +Index: dbus-0.23/tools/dbus-tree-view.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-tree-view.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-tree-view.c 2005-04-02 17:14:38.026003584 -0500 +@@ -24,8 +24,12 @@ + #include <config.h> + #include "dbus-tree-view.h" + ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + enum +Index: dbus-0.23/tools/dbus-viewer.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-viewer.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-viewer.c 2005-04-02 17:14:38.027003432 -0500 +@@ -30,8 +30,12 @@ + #include <glib/dbus-gparser.h> + #include <glib/dbus-gutils.h> + ++#ifdef HAVE_GETTEXT + #include <libintl.h> + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + typedef struct diff --git a/packages/python/python-dbus/tmpdir.patch b/packages/python/python-dbus/tmpdir.patch index e69de29bb2..838b903f0a 100644 --- a/packages/python/python-dbus/tmpdir.patch +++ b/packages/python/python-dbus/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/python/python-dbus_0.23.bb b/packages/python/python-dbus_0.23.bb index e69de29bb2..56bff28849 100644 --- a/packages/python/python-dbus_0.23.bb +++ b/packages/python/python-dbus_0.23.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication" +SECTION = "devel/python" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" +RDEPENDS = "dbus" +PR = "ml1" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://gettext.patch;patch=1" +S = "${WORKDIR}/dbus-${PV}" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x --enable-python" + +FILES_${PN} = "${libdir}/python2.4/site-packages/dbus.* ${libdir}/python2.4/site-packages/dbus_bindings.so" + diff --git a/packages/python/python-imdbpy_1.9.bb b/packages/python/python-imdbpy_1.9.bb index e69de29bb2..5e098478b2 100644 --- a/packages/python/python-imdbpy_1.9.bb +++ b/packages/python/python-imdbpy_1.9.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +SRCNAME = "imdbpy" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/IMDbPY-${PV}" + +inherit distutils + diff --git a/packages/python/python-inotify_0.0.6.bb b/packages/python/python-inotify_0.0.6.bb index e69de29bb2..6f74aa32b5 100644 --- a/packages/python/python-inotify_0.0.6.bb +++ b/packages/python/python-inotify_0.0.6.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Python Linux Inotify Wrapper" +SECTION = "devel/python" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" + +SRC_URI = "http://www.amautacorp.com/staff/Rudd-O/projects/files/search-services/python-inotify-${PV}.tar.gz" + +inherit distutils + diff --git a/packages/python/python-libgmail_0.0.7.bb b/packages/python/python-libgmail_0.0.7.bb index e69de29bb2..fca95e995e 100644 --- a/packages/python/python-libgmail_0.0.7.bb +++ b/packages/python/python-libgmail_0.0.7.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Python Bindings for Google's Gmail Service" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +RDEPENDS = "python-core python-netclient python-email" +SRCNAME = "libgmail" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tgz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils-base + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR} + for file in *.py + do + install -m 0755 ${file} ${D}${libdir}/${PYTHON_DIR} + done +} diff --git a/packages/python/python-m2crypto-0.13.1/.mtn2git_empty b/packages/python/python-m2crypto-0.13.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-m2crypto-0.13.1/.mtn2git_empty diff --git a/packages/python/python-m2crypto-0.13.1/0.13p1.patch b/packages/python/python-m2crypto-0.13.1/0.13p1.patch index d938f7969e..ad359185e6 100644 --- a/packages/python/python-m2crypto-0.13.1/0.13p1.patch +++ b/packages/python/python-m2crypto-0.13.1/0.13p1.patch @@ -32,8 +32,8 @@ @@ -1,8 +1,8 @@ """M2Crypto Version Info""" --RCS_id='$Id$' -+RCS_id='$Id$' +-RCS_id='$Id: _version.py,v 1.2 2004/03/25 06:33:29 ngps Exp $' ++RCS_id='$Id: _version.py,v 1.3 2004/03/31 01:30:58 ngps Exp $' import string -version_info = (0, 13) diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/python/python-native-2.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-native-2.3.3/.mtn2git_empty diff --git a/packages/python/python-native-2.4.0/.mtn2git_empty b/packages/python/python-native-2.4.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-native-2.4.0/.mtn2git_empty diff --git a/packages/python/python-native-2.4.0/bindir-libdir.patch b/packages/python/python-native-2.4.0/bindir-libdir.patch index e69de29bb2..999bddc449 100644 --- a/packages/python/python-native-2.4.0/bindir-libdir.patch +++ b/packages/python/python-native-2.4.0/bindir-libdir.patch @@ -0,0 +1,18 @@ + +# +# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 ++++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 +@@ -78,8 +78,8 @@ + exec_prefix= @exec_prefix@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.4.0/cross-distutils.patch b/packages/python/python-native-2.4.0/cross-distutils.patch index e69de29bb2..76ae883c1d 100644 --- a/packages/python/python-native-2.4.0/cross-distutils.patch +++ b/packages/python/python-native-2.4.0/cross-distutils.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 ++++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 +@@ -19,8 +19,8 @@ + from errors import DistutilsPlatformError + + # These are needed in a couple of spots, so just compute them once. +-PREFIX = os.path.normpath(sys.prefix) +-EXEC_PREFIX = os.path.normpath(sys.exec_prefix) ++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) ++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) + + # 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 @@ + 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 @@ + 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") ) + + + def parse_config_h(fp, g=None): diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index e69de29bb2..1fba9a2557 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "" +PR = "r0" + +EXCLUDE_FROM_WORLD = "1" + +SRC_URI = "ftp://www.python.org/pub/python/2.4/Python-2.4.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1" +S = "${WORKDIR}/Python-2.4" + +inherit autotools native + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ + --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' + +do_configure () { + oe_runconf +} + +do_stage_append() { + # install pgen for later usage with non-native builds + install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ +} + diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb index e69de29bb2..f21c377da2 100644 --- a/packages/python/python-numarray_1.1.1.bb +++ b/packages/python/python-numarray_1.1.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Next Generation sophisticated Numeric Processing Package for Python" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "PYRAF" +SRCNAME = "numarray" + +SRC_URI = ${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-numeric/.mtn2git_empty b/packages/python/python-numeric/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-numeric/.mtn2git_empty diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb index e69de29bb2..2fc0e8873c 100644 --- a/packages/python/python-numeric_23.7.bb +++ b/packages/python/python-numeric_23.7.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A sophisticated Numeric Processing Package for Python" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "PSF" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \ + file://no-lapack.patch;patch=1" +S = "${WORKDIR}/Numeric-${PV}" + +inherit distutils + +do_stage() { + cp -a Include/Numeric ${STAGING_INCDIR} +} + diff --git a/packages/python/python-pycodes-1.1/.mtn2git_empty b/packages/python/python-pycodes-1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pycodes-1.1/.mtn2git_empty diff --git a/packages/python/python-pygame-1.6/.mtn2git_empty b/packages/python/python-pygame-1.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pygame-1.6/.mtn2git_empty diff --git a/packages/python/python-pygtk-0.6.12/.mtn2git_empty b/packages/python/python-pygtk-0.6.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pygtk-0.6.12/.mtn2git_empty diff --git a/packages/python/python-pygtk2/.mtn2git_empty b/packages/python/python-pygtk2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pygtk2/.mtn2git_empty diff --git a/packages/python/python-pygtk2/acinclude.m4 b/packages/python/python-pygtk2/acinclude.m4 index e69de29bb2..eec3758afc 100644 --- a/packages/python/python-pygtk2/acinclude.m4 +++ b/packages/python/python-pygtk2/acinclude.m4 @@ -0,0 +1,84 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN(AM_CHECK_PYMOD, +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include <Python.h>],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) + +dnl +dnl JH_ADD_CFLAG(FLAG) +dnl checks whether the C compiler supports the given flag, and if so, adds +dnl it to $CFLAGS. If the flag is already present in the list, then the +dnl check is not performed. +AC_DEFUN([JH_ADD_CFLAG], +[ +case " $CFLAGS " in +*@<:@\ \ @:>@$1@<:@\ \ @:>@*) + ;; +*) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_MSG_CHECKING([whether [$]CC understands $1]) + AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) + AC_MSG_RESULT($jh_has_option) + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi + ;; +esac]) diff --git a/packages/python/python-pygtk2_2.4.1.bb b/packages/python/python-pygtk2_2.4.1.bb index e69de29bb2..2b589e8d8a 100644 --- a/packages/python/python-pygtk2_2.4.1.bb +++ b/packages/python/python-pygtk2_2.4.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "gtk+ libglade" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig distutils-base + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes +} + diff --git a/packages/python/python-pygtk2_2.6.2.bb b/packages/python/python-pygtk2_2.6.2.bb index e69de29bb2..3bc7b60435 100644 --- a/packages/python/python-pygtk2_2.6.2.bb +++ b/packages/python/python-pygtk2_2.6.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "gtk+ libglade" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig distutils-base + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ +} + diff --git a/packages/python/python-pylinda/.mtn2git_empty b/packages/python/python-pylinda/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pylinda/.mtn2git_empty diff --git a/packages/python/python-pyqt-3.13/.mtn2git_empty b/packages/python/python-pyqt-3.13/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pyqt-3.13/.mtn2git_empty diff --git a/packages/python/python-pyqt-3.13/qt2-fix.patch b/packages/python/python-pyqt-3.13/qt2-fix.patch index e69de29bb2..5ee978e8f6 100644 --- a/packages/python/python-pyqt-3.13/qt2-fix.patch +++ b/packages/python/python-pyqt-3.13/qt2-fix.patch @@ -0,0 +1,124 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip +@@ -235,7 +235,7 @@ + sipClass = sipClass_QCanvasLine; + break; + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + case 8: + sipClass = sipClass_QCanvasSpline; + break; +--- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip +@@ -114,7 +114,7 @@ + %ConvertToSubClassCode + Py_BEGIN_ALLOW_THREADS + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + int rtti = sipCpp -> rtti(); + + if (rtti == QCheckTableItem::RTTI) +--- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip +@@ -102,7 +102,7 @@ + #endif + {sipName_QComboBox, &sipClass_QComboBox}, + {sipName_QCommonStyle, &sipClass_QCommonStyle}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QDateEdit, &sipClass_QDateEdit}, + {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, + {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, +@@ -111,13 +111,13 @@ + {sipName_QDial, &sipClass_QDial}, + #endif + {sipName_QDialog, &sipClass_QDialog}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QDockArea, &sipClass_QDockArea}, + {sipName_QDockWindow, &sipClass_QDockWindow}, + #endif + {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, + {sipName_QDragObject, &sipClass_QDragObject}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QErrorMessage, &sipClass_QErrorMessage}, + #endif + #if QT_VERSION >= 0x030100 +@@ -133,7 +133,7 @@ + {sipName_QFrame, &sipClass_QFrame}, + {sipName_QGrid, &sipClass_QGrid}, + {sipName_QGridLayout, &sipClass_QGridLayout}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QGridView, &sipClass_QGridView}, + #endif + {sipName_QGroupBox, &sipClass_QGroupBox}, +@@ -175,7 +175,7 @@ + {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, + {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, + #endif +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, + #endif + #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) +@@ -185,7 +185,7 @@ + #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) + {sipName_QPrintDialog, &sipClass_QPrintDialog}, + #endif +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QProcess, &sipClass_QProcess}, + #endif + {sipName_QProgressBar, &sipClass_QProgressBar}, +@@ -194,7 +194,7 @@ + #endif + {sipName_QPushButton, &sipClass_QPushButton}, + {sipName_QRadioButton, &sipClass_QRadioButton}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, + #endif + #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) +@@ -229,11 +229,11 @@ + {sipName_QTabWidget, &sipClass_QTabWidget}, + {sipName_QTextBrowser, &sipClass_QTextBrowser}, + {sipName_QTextDrag, &sipClass_QTextDrag}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QTextEdit, &sipClass_QTextEdit}, + #endif + {sipName_QTextView, &sipClass_QTextView}, +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + {sipName_QTimeEdit, &sipClass_QTimeEdit}, + #endif + {sipName_QTimer, &sipClass_QTimer}, +--- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix ++++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip +@@ -528,7 +528,7 @@ + sipClass = sipClass_QChildEvent; + break; + +-#if QT_VERSION >= 300 ++#if QT_VERSION >= 0x030000 + case QEvent::ContextMenu: + sipClass = sipClass_QContextMenuEvent; + break; +@@ -539,7 +539,7 @@ + break; + #endif + +-#if QT_VERSION >= 300 && QT_VERSION < 0x030100 ++#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 + case QEvent::IMCompose: + sipClass = sipClass_QIMEvent; + break; diff --git a/packages/python/python-pyqwt-3.10/.mtn2git_empty b/packages/python/python-pyqwt-3.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pyqwt-3.10/.mtn2git_empty diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb index e69de29bb2..3a0d977dbb 100644 --- a/packages/python/python-pyrex-native_0.9.3.bb +++ b/packages/python/python-pyrex-native_0.9.3.bb @@ -0,0 +1,8 @@ +include python-pyrex_${PV}.bb +inherit native +DEPENDS = "python-native" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR} +} diff --git a/packages/python/python-pyrex_0.9.3.bb b/packages/python/python-pyrex_0.9.3.bb index e69de29bb2..36b8370e60 100644 --- a/packages/python/python-pyrex_0.9.3.bb +++ b/packages/python/python-pyrex_0.9.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \ +It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ +and the messy, low-level world of C." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +SRCNAME = "Pyrex" +PR = "ml0" + +SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-pyro/.mtn2git_empty b/packages/python/python-pyro/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pyro/.mtn2git_empty diff --git a/packages/python/python-pysqlite2_2.0.2.bb b/packages/python/python-pysqlite2_2.0.2.bb index e69de29bb2..124a2ed5bc 100644 --- a/packages/python/python-pysqlite2_2.0.2.bb +++ b/packages/python/python-pysqlite2_2.0.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "PSF" +RDEPENDS = "python-core python-re python-lang" +DEPENDS = "sqlite3" +SRCNAME = "pysqlite" +PR = "ml0" + +SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.0/${PV}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-pytest_0.5.0.bb b/packages/python/python-pytest_0.5.0.bb index e69de29bb2..73a73ca005 100644 --- a/packages/python/python-pytest_0.5.0.bb +++ b/packages/python/python-pytest_0.5.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "This is a small package that facilitates the unit testing process \ +by aggregating PyUnit tests and making them easier to call from the command \ +line and from within other unit tests." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +SRCNAME = "pytest" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-pyweather_0.5.0.bb b/packages/python/python-pyweather_0.5.0.bb index e69de29bb2..7f630030d0 100644 --- a/packages/python/python-pyweather_0.5.0.bb +++ b/packages/python/python-pyweather_0.5.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "PyWeather is a collection of weather related modules \ +that are capable of performing conversion calculations for many common meteorological units." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +SRCNAME = "pyweather" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/weather-${PV}" + +inherit distutils diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index e69de29bb2..d393226790 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "A sophisticated XML Processing Package for Python" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "PSF" +RDEPENDS = "python-core python-xml python-netclient" +SRCNAME = "pyxml" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" +S = "${WORKDIR}/PyXML-${PV}" + +inherit distutils + diff --git a/packages/python/python-scons_0.96.90.bb b/packages/python/python-scons_0.96.90.bb index e69de29bb2..3db28863ba 100644 --- a/packages/python/python-scons_0.96.90.bb +++ b/packages/python/python-scons_0.96.90.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A Software Construction Tool" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +SRCNAME = "scons" + +SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-soappy-0.11.3/.mtn2git_empty b/packages/python/python-soappy-0.11.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-soappy-0.11.3/.mtn2git_empty diff --git a/packages/python/python-soappy-0.11.3/fpconst.py b/packages/python/python-soappy-0.11.3/fpconst.py index 3509a139bb..a1f8f47e3a 100644 --- a/packages/python/python-soappy-0.11.3/fpconst.py +++ b/packages/python/python-soappy-0.11.3/fpconst.py @@ -22,7 +22,7 @@ Copyright: (c) 2003, Pfizer, Inc. """ __version__ = "0.6.0" -ident = "$Id$" +ident = "$Id: fpconst.py,v 1.8 2003/05/12 15:14:00 warnes Exp $" import struct diff --git a/packages/python/python-vorbis-1.3/.mtn2git_empty b/packages/python/python-vorbis-1.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-vorbis-1.3/.mtn2git_empty |