--- a/patches/Python-05-isalibs.diff Sat Nov 04 22:46:11 2006 +0000
+++ b/patches/Python-05-isalibs.diff Sun Nov 05 03:30:17 2006 +0000
@@ -1,6 +1,6 @@
---- Python-2.4.2/Python/import.c Wed Sep 14 11:15:03 2005
-+++ Python-2.4.2-new/Python/import.c Tue Aug 29 17:06:36 2006
-@@ -702,8 +702,9 @@
+--- Python-2.4.4/Python/import.c.patch05 2006-10-05 14:08:58.000000000 -0400
++++ Python-2.4.4/Python/import.c 2006-11-04 20:49:28.497670000 -0500
+@@ -707,8 +707,9 @@
}
pyc_mtime = PyMarshal_ReadLongFromFile(fp);
if (pyc_mtime != mtime) {
@@ -12,7 +12,7 @@
fclose(fp);
return NULL;
}
-@@ -1058,6 +1059,57 @@
+@@ -1068,6 +1069,57 @@
static int find_init_module(char *); /* Forward */
static struct filedescr importhookdescr = {"", "", IMP_HOOK};
@@ -70,7 +70,7 @@
static struct filedescr *
find_module(char *fullname, char *subname, PyObject *path, char *buf,
size_t buflen, FILE **p_fp, PyObject **p_loader)
-@@ -1075,11 +1127,10 @@
+@@ -1085,11 +1137,10 @@
static struct filedescr fd_builtin = {"", "", C_BUILTIN};
static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
char name[MAXPATHLEN+1];
@@ -83,7 +83,7 @@
if (p_loader != NULL)
*p_loader = NULL;
-@@ -1269,7 +1320,7 @@
+@@ -1281,15 +1332,19 @@
}
#endif
#endif
@@ -92,7 +92,6 @@
/* take a snapshot of the module spec for restoration
* after the 8 character DLL hackery
*/
-@@ -1276,8 +1327,12 @@
saved_buf = strdup(buf);
saved_len = len;
saved_namelen = namelen;
@@ -106,7 +105,7 @@
#if defined(PYOS_OS2)
/* OS/2 limits DLLs to 8 character names (w/o
extension)
-@@ -1318,14 +1373,12 @@
+@@ -1330,21 +1385,18 @@
fp = NULL;
}
}
@@ -122,7 +121,6 @@
/* don't need/want the module name snapshot anymore */
if (saved_buf)
{
-@@ -1332,7 +1385,6 @@
free(saved_buf);
saved_buf = NULL;
}
@@ -130,8 +128,22 @@
Py_XDECREF(copy);
if (fp != NULL)
break;
---- Python-2.4.2/Lib/distutils/command/build_ext.py Wed Nov 10 14:23:15 2004
-+++ Python-2.4.2-new/Lib/distutils/command/build_ext.py Thu Aug 24 18:22:44 2006
+--- Python-2.4.4/Python/importdl.h.patch05 2002-12-30 17:08:05.000000000 -0500
++++ Python-2.4.4/Python/importdl.h 2006-11-04 20:49:28.500505000 -0500
+@@ -31,8 +31,9 @@
+ extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
+ FILE *);
+
+-/* Max length of module suffix searched for -- accommodates "module.slb" */
+-#define MAXSUFFIXSIZE 12
++/* Max length of module suffix searched for -- accommodates "module.slb"
++ and "64/" */
++#define MAXSUFFIXSIZE 15
+
+ #ifdef MS_WINDOWS
+ #include <windows.h>
+--- Python-2.4.4/Lib/distutils/command/build_ext.py.patch05 2004-11-10 17:23:15.000000000 -0500
++++ Python-2.4.4/Lib/distutils/command/build_ext.py 2006-11-04 20:49:28.499417000 -0500
@@ -614,7 +614,13 @@
so_ext = get_config_var('SO')
if os.name == 'nt' and self.debug:
@@ -147,25 +159,8 @@
def get_export_symbols (self, ext):
"""Return the list of symbols that a shared extension has to
-No differences encountered
-No differences encountered
-No differences encountered
---- Python-2.4.2/Python/importdl.h Mon Dec 30 14:08:05 2002
-+++ Python-2.4.2-new/Python/importdl.h Thu Aug 24 17:43:33 2006
-@@ -31,8 +31,9 @@
- extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
- FILE *);
-
--/* Max length of module suffix searched for -- accommodates "module.slb" */
--#define MAXSUFFIXSIZE 12
-+/* Max length of module suffix searched for -- accommodates "module.slb"
-+ and "64/" */
-+#define MAXSUFFIXSIZE 15
-
- #ifdef MS_WINDOWS
- #include <windows.h>
---- Python-2.4.2/configure.in Sun Aug 7 14:08:53 2005
-+++ Python-2.4.2-new/configure.in Tue Aug 22 19:06:04 2006
+--- Python-2.4.4/configure.in.patch05 2006-10-17 12:03:36.000000000 -0400
++++ Python-2.4.4/configure.in 2006-11-04 21:00:54.845972000 -0500
@@ -14,8 +14,36 @@
AH_TOP([
#ifndef Py_PYCONFIG_H
@@ -230,7 +225,7 @@
# Arguments passed to configure.
AC_SUBST(CONFIG_ARGS)
CONFIG_ARGS="$ac_configure_args"
-@@ -1064,15 +1112,8 @@
+@@ -1142,15 +1190,8 @@
AC_TYPE_SIZE_T
AC_TYPE_UID_T
@@ -248,7 +243,7 @@
AC_MSG_CHECKING(for long long support)
have_long_long=no
-@@ -1081,9 +1122,6 @@
+@@ -1159,107 +1200,28 @@
have_long_long=yes
])
AC_MSG_RESULT($have_long_long)
@@ -256,15 +251,13 @@
-AC_CHECK_SIZEOF(long long, 8)
-fi
- AC_MSG_CHECKING(for uintptr_t support)
- have_uintptr_t=no
-@@ -1092,101 +1130,21 @@
- have_uintptr_t=yes
- ])
- AC_MSG_RESULT($have_uintptr_t)
--if test "$have_uintptr_t" = yes ; then
--AC_CHECK_SIZEOF(uintptr_t, 4)
--fi
+ AC_CHECK_TYPES(uintptr_t,
+- [AC_CHECK_SIZEOF(uintptr_t, 4)],
++ [],
+ [], [#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif])
+
-# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
-AC_MSG_CHECKING(size of off_t)
@@ -284,10 +277,11 @@
-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,
-[The number of bytes in an off_t.])
++])
AC_MSG_CHECKING(whether to enable large file support)
-if test "$have_long_long" = yes -a \
@@ -302,13 +296,7 @@
-else
- AC_MSG_RESULT(no)
-fi
-+AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
-+[Defined to enable large file support when an off_t is bigger than a long
-+ and long long is available and at least as big as an off_t. You may need
-+ to add some flags for configuration and compilation to enable this mode.
-+ (For Solaris and Linux, the necessary defines are already defined.)])
-+AC_MSG_RESULT(yes)
-
+-
-# AC_CHECK_SIZEOF() doesn't include <time.h>.
-AC_MSG_CHECKING(size of time_t)
-AC_CACHE_VAL(ac_cv_sizeof_time_t,
@@ -329,7 +317,7 @@
-AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
-[The number of bytes in a time_t.])
-
--
+
-# if have pthread_t then define SIZEOF_PTHREAD_T
-ac_save_cc="$CC"
-if test "$ac_cv_kpthread" = "yes"
@@ -365,11 +353,16 @@
- [The number of bytes in a pthread_t.])
-fi
-CC="$ac_save_cc"
--
++AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
++[Defined to enable large file support when an off_t is bigger than a long
++ and long long is available and at least as big as an off_t. You may need
++ to add some flags for configuration and compilation to enable this mode.
++ (For Solaris and Linux, the necessary defines are already defined.)])
++AC_MSG_RESULT(yes)
+
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))
-@@ -1408,10 +1366,6 @@
+@@ -1496,10 +1458,6 @@
if test -z "$CCSHARED"
then
case $ac_sys_system/$ac_sys_release in
@@ -380,7 +373,7 @@
hp*|HP*) if test "$GCC" = yes;
then CCSHARED="-fPIC";
else CCSHARED="+z";
-@@ -2705,12 +2663,6 @@
+@@ -2815,12 +2773,6 @@
wchar_h="no"
)
@@ -393,7 +386,7 @@
AC_MSG_CHECKING(for UCS-4 tcl)
have_ucs4_tcl=no
AC_TRY_COMPILE([
-@@ -2740,6 +2692,11 @@
+@@ -2850,6 +2802,11 @@
ac_cv_wchar_t_signed=no,
ac_cv_wchar_t_signed=yes)])
AC_MSG_RESULT($ac_cv_wchar_t_signed)
@@ -405,9 +398,9 @@
fi
AC_MSG_CHECKING(what type to use for unicode)
---- Python-2.4.2/Makefile.pre.in Mon Mar 28 15:23:01 2005
-+++ Python-2.4.2-new/Makefile.pre.in Tue Aug 22 17:45:05 2006
-@@ -79,7 +79,7 @@
+--- Python-2.4.4/Makefile.pre.in.patch05 2006-10-08 13:41:25.000000000 -0400
++++ Python-2.4.4/Makefile.pre.in 2006-11-04 20:49:28.627191000 -0500
+@@ -79,18 +79,18 @@
# Expanded directories
BINDIR= $(exec_prefix)/bin
@@ -416,7 +409,6 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-@@ -86,11 +86,11 @@
SCRIPTDIR= $(prefix)/lib
# Detailed destination directories
@@ -433,7 +425,7 @@
# Symbols used for using shared libraries
SO= @SO@
-@@ -747,6 +747,7 @@
+@@ -777,6 +777,7 @@
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)