diff -urN Python-2.5.1/Modules/Setup.dist Python-2.5.1-eota/Modules/Setup.dist --- Python-2.5.1/Modules/Setup.dist 2006-08-06 16:26:21.000000000 +0900 +++ Python-2.5.1-eota/Modules/Setup.dist 2007-09-09 21:40:27.000000000 +0900 @@ -164,20 +164,20 @@ # Modules that should always be present (non UNIX dependent): -#array arraymodule.c # array objects -#cmath cmathmodule.c # -lm # complex math library functions -#math mathmodule.c # -lm # math library functions, e.g. sin() -#_struct _struct.c # binary structure packing/unpacking -#time timemodule.c # -lm # time operations and variables -#operator operator.c # operator.add() and similar goodies +array arraymodule.c # array objects +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c # -lm # math library functions, e.g. sin() +_struct _struct.c # binary structure packing/unpacking +time timemodule.c # -lm # time operations and variables +operator operator.c # operator.add() and similar goodies #_weakref _weakref.c # basic weak reference support #_testcapi _testcapimodule.c # Python C API test module -#_random _randommodule.c # Random number generator +_random _randommodule.c # Random number generator #collections collectionsmodule.c # Container types -#itertools itertoolsmodule.c # Functions creating iterators for efficient looping -#strop stropmodule.c # String manipulations +itertools itertoolsmodule.c # Functions creating iterators for efficient looping +strop stropmodule.c # String manipulations -#unicodedata unicodedata.c # static Unicode character database +unicodedata unicodedata.c # static Unicode character database # access to ISO C locale support #_locale _localemodule.c # -lintl @@ -241,12 +241,12 @@ # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5.c and md5.h are included here. -#_md5 md5module.c md5.c +_md5 md5module.c md5.c # The _sha module implements the SHA checksum algorithm. # (NIST's Secure Hash Algorithm.) -#_sha shamodule.c +_sha shamodule.c # SGI IRIX specific modules -- off by default. @@ -421,7 +421,7 @@ # Helper module for various ascii-encoders -#binascii binascii.c +binascii binascii.c # Fred Drake's interface to the Python parser #parser parsermodule.c diff -urN Python-2.5.1/Modules/posixmodule.c Python-2.5.1-eota/Modules/posixmodule.c --- Python-2.5.1/Modules/posixmodule.c 2007-04-05 03:30:56.000000000 +0900 +++ Python-2.5.1-eota/Modules/posixmodule.c 2007-09-09 21:38:58.000000000 +0900 @@ -1427,6 +1427,7 @@ #endif /* Py_WIN_WIDE_FILENAMES */ #endif /* MS_WINDOWS */ +#ifndef EOTA static PyObject * posix_do_stat(PyObject *self, PyObject *args, char *format, @@ -1490,6 +1491,7 @@ PyMem_Free(pathfree); return result; } +#endif /* !EOTA */ /* POSIX methods */ @@ -2441,6 +2443,7 @@ } +#ifndef EOTA PyDoc_STRVAR(posix_stat__doc__, "stat(path) -> stat result\n\n\ Perform a stat system call on the given path."); @@ -2454,6 +2457,7 @@ return posix_do_stat(self, args, "et:stat", STAT, NULL, NULL); #endif } +#endif /* !EOTA */ #ifdef HAVE_SYSTEM @@ -2511,6 +2515,9 @@ #endif } +#ifdef EOTA +#undef HAVE_UNAME +#endif /* !EOTA */ #ifdef HAVE_UNAME PyDoc_STRVAR(posix_uname__doc__, @@ -5690,6 +5697,7 @@ #endif +#ifndef EOTA PyDoc_STRVAR(posix_lstat__doc__, "lstat(path) -> stat result\n\n\ Like stat(path), but do not follow symbolic links."); @@ -5707,6 +5715,7 @@ #endif #endif /* !HAVE_LSTAT */ } +#endif /* !EOTA */ #ifdef HAVE_READLINK @@ -6183,6 +6192,7 @@ } Py_BEGIN_ALLOW_THREADS #if !defined(MS_WINDOWS) && defined(HAVE_FCNTL_H) +#ifndef EOTA if (mode[0] == 'a') { /* try to make sure the O_APPEND flag is set */ int flags; @@ -6196,6 +6206,7 @@ } else { fp = fdopen(fd, mode); } +#endif /* !EOTA */ #else fp = fdopen(fd, mode); #endif @@ -8098,7 +8109,9 @@ {"link", posix_link, METH_VARARGS, posix_link__doc__}, #endif /* HAVE_LINK */ {"listdir", posix_listdir, METH_VARARGS, posix_listdir__doc__}, +#ifndef EOTA {"lstat", posix_lstat, METH_VARARGS, posix_lstat__doc__}, +#endif /* !EOTA */ {"mkdir", posix_mkdir, METH_VARARGS, posix_mkdir__doc__}, #ifdef HAVE_NICE {"nice", posix_nice, METH_VARARGS, posix_nice__doc__}, @@ -8108,7 +8121,9 @@ #endif /* HAVE_READLINK */ {"rename", posix_rename, METH_VARARGS, posix_rename__doc__}, {"rmdir", posix_rmdir, METH_VARARGS, posix_rmdir__doc__}, +#ifndef EOTA {"stat", posix_stat, METH_VARARGS, posix_stat__doc__}, +#endif /* !EOTA */ {"stat_float_times", stat_float_times, METH_VARARGS, stat_float_times__doc__}, #ifdef HAVE_SYMLINK {"symlink", posix_symlink, METH_VARARGS, posix_symlink__doc__}, diff -urN Python-2.5.1/configure Python-2.5.1-eota/configure --- Python-2.5.1/configure 2007-03-12 19:50:51.000000000 +0900 +++ Python-2.5.1-eota/configure 2007-09-09 21:39:08.000000000 +0900 @@ -22056,6 +22056,7 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +cat > /dev/null << _COOUT echo "$as_me:$LINENO: checking for /dev/ptmx" >&5 echo $ECHO_N "checking for /dev/ptmx... $ECHO_C" >&6 @@ -22165,6 +22166,7 @@ fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +_COOUT echo "$as_me:$LINENO: checking for socklen_t" >&5 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 diff -urN Python-2.5.1/inst-eo.sh Python-2.5.1-eota/inst-eo.sh --- Python-2.5.1/inst-eo.sh 1970-01-01 09:00:00.000000000 +0900 +++ Python-2.5.1-eota/inst-eo.sh 2007-09-09 22:54:03.000000000 +0900 @@ -0,0 +1,27 @@ +#!/bin/sh +# 2007/9/9 Nakanishi + +FROM=/tmp/eotemp/usr/lib/python2.5 +TO=/tmp/eotemparc/usr/lib/python2.5 +SOURCEDIR=./ +## ConfigParser.py sre_compile.py sre_constants.py + +mkdir -p ${TO} ${TO}/../../bin +for i in __future__.py ConfigParser.py StringIO.py UserDict.py \ + compileall.py copy.py copy_reg.py dis.py fnmatch.py getopt.py \ + glob.py inspect.py linecache.py opcode.py optparse.py os.py \ + pickle.py platform.py popen2.py posixpath.py py_compile.py \ + random.py re.py repr.py socket.py sre.py sre_compile.py \ + sre_constants.py sre_parse.py stat.py string.py subprocess.py \ + tempfile.py textwrap.py token.py tokenize.py traceback.py \ + types.py warnings.py site.py ; + do cp ${FROM}/${i} ${TO}/ ; done +cp $SOURCEDIR/python-eota ${TO}/../../bin/python + +cd ${TO} +mv ConfigParser.py ConfParser.py +mv sre_compile.py sre_compil.py +mv sre_constants.py sre_const.py +for i in `ls *.py` ; do sed -e 's/ConfigParser/ConfParser/g; s/sre_compile/sre_compil/g; s/sre_constants/sre_const/g' \ + < ${i} > ${i}.new && mv ${i}.new ${i} ; done +sed -e 's/paths_in_sys = addsitepackages/## paths_in_sys = addsitepackages/g' < site.py > site.py.new && mv site.py.new site.py