mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 21:30:08 +02:00
updated python patch for 2.6.4 release
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
diff -urN Python-2.6.4rc1/Lib/plat-haiku1/IN.py Python-2.6.4rc1-haiku/Lib/plat-haiku1/IN.py
|
||||
--- Python-2.6.4rc1/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Lib/plat-haiku1/IN.py 2009-05-14 08:56:04.000000000 +0000
|
||||
diff -urN Python-2.6.4/Lib/plat-haiku1/IN.py Python-2.6.4-haiku/Lib/plat-haiku1/IN.py
|
||||
--- Python-2.6.4/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Lib/plat-haiku1/IN.py 2009-05-14 08:56:04.000000000 +0000
|
||||
@@ -0,0 +1,327 @@
|
||||
+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h
|
||||
+
|
||||
@@ -329,9 +329,9 @@ diff -urN Python-2.6.4rc1/Lib/plat-haiku1/IN.py Python-2.6.4rc1-haiku/Lib/plat-h
|
||||
+def _FDMSKNO(fd): return ((fd) / NFDBITS)
|
||||
+
|
||||
+def _FDBITNO(fd): return ((fd) % NFDBITS)
|
||||
diff -urN Python-2.6.4rc1/Lib/plat-haiku1/regen Python-2.6.4rc1-haiku/Lib/plat-haiku1/regen
|
||||
--- Python-2.6.4rc1/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Lib/plat-haiku1/regen 2009-05-14 08:56:04.000000000 +0000
|
||||
diff -urN Python-2.6.4/Lib/plat-haiku1/regen Python-2.6.4-haiku/Lib/plat-haiku1/regen
|
||||
--- Python-2.6.4/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Lib/plat-haiku1/regen 2009-05-14 08:56:04.000000000 +0000
|
||||
@@ -0,0 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+
|
||||
@@ -340,9 +340,9 @@ diff -urN Python-2.6.4rc1/Lib/plat-haiku1/regen Python-2.6.4rc1-haiku/Lib/plat-h
|
||||
+
|
||||
+set -v
|
||||
+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
|
||||
diff -urN Python-2.6.4rc1/Modules/resource.c Python-2.6.4rc1-haiku/Modules/resource.c
|
||||
--- Python-2.6.4rc1/Modules/resource.c 2009-05-14 08:59:56.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Modules/resource.c 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c
|
||||
--- Python-2.6.4/Modules/resource.c 2009-05-14 08:59:56.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Modules/resource.c 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -86,6 +86,7 @@
|
||||
PyFloat_FromDouble(doubletime(ru.ru_utime)));
|
||||
PyStructSequence_SET_ITEM(result, 1,
|
||||
@@ -359,9 +359,9 @@ diff -urN Python-2.6.4rc1/Modules/resource.c Python-2.6.4rc1-haiku/Modules/resou
|
||||
|
||||
if (PyErr_Occurred()) {
|
||||
Py_DECREF(result);
|
||||
diff -urN Python-2.6.4rc1/Modules/socketmodule.c Python-2.6.4rc1-haiku/Modules/socketmodule.c
|
||||
--- Python-2.6.4rc1/Modules/socketmodule.c 2009-05-14 08:59:52.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Modules/socketmodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketmodule.c
|
||||
--- Python-2.6.4/Modules/socketmodule.c 2009-05-14 08:59:52.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Modules/socketmodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -4637,7 +4637,9 @@
|
||||
#ifndef __BEOS__
|
||||
/* We have incomplete socket support. */
|
||||
@@ -372,9 +372,9 @@ diff -urN Python-2.6.4rc1/Modules/socketmodule.c Python-2.6.4rc1-haiku/Modules/s
|
||||
#if defined(SOCK_RDM)
|
||||
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
|
||||
#endif
|
||||
diff -urN Python-2.6.4rc1/Modules/socketmodule.h Python-2.6.4rc1-haiku/Modules/socketmodule.h
|
||||
--- Python-2.6.4rc1/Modules/socketmodule.h 2009-05-14 08:59:48.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Modules/socketmodule.h 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketmodule.h
|
||||
--- Python-2.6.4/Modules/socketmodule.h 2009-05-14 08:59:48.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Modules/socketmodule.h 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -47,6 +47,10 @@
|
||||
# undef AF_NETLINK
|
||||
#endif
|
||||
@@ -386,9 +386,9 @@ diff -urN Python-2.6.4rc1/Modules/socketmodule.h Python-2.6.4rc1-haiku/Modules/s
|
||||
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
||||
#include <bluetooth/bluetooth.h>
|
||||
#include <bluetooth/rfcomm.h>
|
||||
diff -urN Python-2.6.4rc1/Modules/spwdmodule.c Python-2.6.4rc1-haiku/Modules/spwdmodule.c
|
||||
--- Python-2.6.4rc1/Modules/spwdmodule.c 2009-05-14 08:59:57.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Modules/spwdmodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodule.c
|
||||
--- Python-2.6.4/Modules/spwdmodule.c 2009-05-14 08:59:57.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Modules/spwdmodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -79,7 +79,9 @@
|
||||
|
||||
SETS(setIndex++, p->sp_namp);
|
||||
@@ -399,9 +399,9 @@ diff -urN Python-2.6.4rc1/Modules/spwdmodule.c Python-2.6.4rc1-haiku/Modules/spw
|
||||
SETI(setIndex++, p->sp_min);
|
||||
SETI(setIndex++, p->sp_max);
|
||||
SETI(setIndex++, p->sp_warn);
|
||||
diff -urN Python-2.6.4rc1/Modules/timemodule.c Python-2.6.4rc1-haiku/Modules/timemodule.c
|
||||
--- Python-2.6.4rc1/Modules/timemodule.c 2009-05-14 08:59:52.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Modules/timemodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodule.c
|
||||
--- Python-2.6.4/Modules/timemodule.c 2009-05-14 08:59:52.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Modules/timemodule.c 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -968,11 +968,11 @@
|
||||
return -1;
|
||||
}
|
||||
@@ -416,18 +416,18 @@ diff -urN Python-2.6.4rc1/Modules/timemodule.c Python-2.6.4rc1-haiku/Modules/tim
|
||||
}
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
diff -urN Python-2.6.4rc1/Parser/asdl_c.py Python-2.6.4rc1-haiku/Parser/asdl_c.py
|
||||
--- Python-2.6.4rc1/Parser/asdl_c.py 2009-05-14 08:59:39.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Parser/asdl_c.py 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/Parser/asdl_c.py Python-2.6.4-haiku/Parser/asdl_c.py
|
||||
--- Python-2.6.4/Parser/asdl_c.py 2009-05-14 08:59:39.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Parser/asdl_c.py 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env python
|
||||
+#! /bin/env python
|
||||
"""Generate C code from an ASDL description."""
|
||||
|
||||
# TO DO
|
||||
diff -urN Python-2.6.4rc1/Tools/scripts/h2py.py Python-2.6.4rc1-haiku/Tools/scripts/h2py.py
|
||||
--- Python-2.6.4rc1/Tools/scripts/h2py.py 2009-05-14 08:59:42.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/Tools/scripts/h2py.py 2009-05-14 09:36:12.000000000 +0000
|
||||
diff -urN Python-2.6.4/Tools/scripts/h2py.py Python-2.6.4-haiku/Tools/scripts/h2py.py
|
||||
--- Python-2.6.4/Tools/scripts/h2py.py 2009-05-14 08:59:42.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/Tools/scripts/h2py.py 2009-05-14 09:36:12.000000000 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env python
|
||||
+#! /bin/env python
|
||||
@@ -443,9 +443,9 @@ diff -urN Python-2.6.4rc1/Tools/scripts/h2py.py Python-2.6.4rc1-haiku/Tools/scri
|
||||
searchdirs=os.environ['BEINCLUDES'].split(';')
|
||||
elif sys.platform.startswith("atheos"):
|
||||
searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
|
||||
diff -urN Python-2.6.4rc1/configure.in Python-2.6.4rc1-haiku/configure.in
|
||||
--- Python-2.6.4rc1/configure.in 2009-05-14 08:59:39.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/configure.in 2009-05-14 08:56:28.000000000 +0000
|
||||
diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
|
||||
--- Python-2.6.4/configure.in 2009-05-14 08:59:39.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/configure.in 2009-05-14 08:56:28.000000000 +0000
|
||||
@@ -706,7 +706,7 @@
|
||||
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
||||
INSTSONAME="$LDLIBRARY".$SOVERSION
|
||||
@@ -510,9 +510,9 @@ diff -urN Python-2.6.4rc1/configure.in Python-2.6.4rc1-haiku/configure.in
|
||||
*) LIBM=-lm
|
||||
esac
|
||||
AC_MSG_CHECKING(for --with-libm=STRING)
|
||||
diff -urN Python-2.6.4rc1/setup.py Python-2.6.4rc1-haiku/setup.py
|
||||
--- Python-2.6.4rc1/setup.py 2009-05-14 08:59:40.000000000 +0000
|
||||
+++ Python-2.6.4rc1-haiku/setup.py 2009-05-14 08:56:29.000000000 +0000
|
||||
diff -urN Python-2.6.4/setup.py Python-2.6.4-haiku/setup.py
|
||||
--- Python-2.6.4/setup.py 2009-05-14 08:59:40.000000000 +0000
|
||||
+++ Python-2.6.4-haiku/setup.py 2009-05-14 08:56:29.000000000 +0000
|
||||
@@ -382,6 +382,9 @@
|
||||
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
||||
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
||||
|
||||
Reference in New Issue
Block a user