haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 13:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modified python patch to use extra include and lib dirs so that zlib is detected.

Browse Source
This commit is contained in:
Chris Roberts
2009-10-27 22:24:52 +00:00
parent 89835402df
commit 52ae285db8
1 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
dev-lang/python/patches/python-2.6.4.patch
View File

@@ -1,6 +1,6 @@
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
diff -ruN 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 1969-12-31 17:00:00.000000000 -0700
+++ Python-2.6.4-haiku/Lib/plat-haiku1/IN.py 2009-10-27 13:31:08.000000000 -0600
@@ -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.4/Lib/plat-haiku1/IN.py Python-2.6.4-haiku/Lib/plat-haiku1/
+def _FDMSKNO(fd): return ((fd) / NFDBITS)
+
+def _FDBITNO(fd): return ((fd) % NFDBITS)
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
diff -ruN 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 1969-12-31 17:00:00.000000000 -0700
+++ Python-2.6.4-haiku/Lib/plat-haiku1/regen 2009-10-27 13:31:08.000000000 -0600
@@ -0,0 +1,7 @@
+#! /bin/sh
+
@@ -340,9 +340,9 @@ diff -urN Python-2.6.4/Lib/plat-haiku1/regen Python-2.6.4-haiku/Lib/plat-haiku1/
+
+set -v
+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
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
diff -ruN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c
--- Python-2.6.4/Modules/resource.c 2009-05-08 14:59:57.000000000 -0600
+++ Python-2.6.4-haiku/Modules/resource.c 2009-10-27 13:31:08.000000000 -0600
@@ -86,6 +86,7 @@
PyFloat_FromDouble(doubletime(ru.ru_utime)));
PyStructSequence_SET_ITEM(result, 1,
@@ -359,10 +359,10 @@ diff -urN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c
if (PyErr_Occurred()) {
Py_DECREF(result);
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 @@
diff -ruN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketmodule.c
--- Python-2.6.4/Modules/socketmodule.c 2009-09-19 01:46:24.000000000 -0600
+++ Python-2.6.4-haiku/Modules/socketmodule.c 2009-10-27 13:31:08.000000000 -0600
@@ -4640,7 +4640,9 @@
#ifndef __BEOS__
/* We have incomplete socket support. */
PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
@@ -372,9 +372,9 @@ diff -urN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketm
#if defined(SOCK_RDM)
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
#endif
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
diff -ruN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketmodule.h
--- Python-2.6.4/Modules/socketmodule.h 2008-06-14 02:36:07.000000000 -0600
+++ Python-2.6.4-haiku/Modules/socketmodule.h 2009-10-27 13:31:08.000000000 -0600
@@ -47,6 +47,10 @@
# undef AF_NETLINK
#endif
@@ -386,9 +386,9 @@ diff -urN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketm
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
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
diff -ruN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodule.c
--- Python-2.6.4/Modules/spwdmodule.c 2008-06-08 22:58:54.000000000 -0600
+++ Python-2.6.4-haiku/Modules/spwdmodule.c 2009-10-27 13:31:08.000000000 -0600
@@ -79,7 +79,9 @@
SETS(setIndex++, p->sp_namp);
@@ -399,9 +399,9 @@ diff -urN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodul
SETI(setIndex++, p->sp_min);
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
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
diff -ruN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodule.c
--- Python-2.6.4/Modules/timemodule.c 2008-07-05 13:19:50.000000000 -0600
+++ Python-2.6.4-haiku/Modules/timemodule.c 2009-10-27 13:31:08.000000000 -0600
@@ -968,11 +968,11 @@
return -1;
}
@@ -416,18 +416,18 @@ diff -urN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodul
}
Py_BEGIN_ALLOW_THREADS
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
diff -ruN 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 2008-11-07 01:56:27.000000000 -0700
+++ Python-2.6.4-haiku/Parser/asdl_c.py 2009-10-27 13:31:08.000000000 -0600
@@ -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.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
diff -ruN 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 2004-08-09 11:27:55.000000000 -0600
+++ Python-2.6.4-haiku/Tools/scripts/h2py.py 2009-10-27 13:31:08.000000000 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /bin/env python
@@ -443,10 +443,10 @@ diff -urN Python-2.6.4/Tools/scripts/h2py.py Python-2.6.4-haiku/Tools/scripts/h2
searchdirs=os.environ['BEINCLUDES'].split(';')
elif sys.platform.startswith("atheos"):
searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
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 @@
diff -ruN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
--- Python-2.6.4/configure.in 2009-09-29 07:01:59.000000000 -0600
+++ Python-2.6.4-haiku/configure.in 2009-10-27 13:31:08.000000000 -0600
@@ -715,7 +715,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -455,7 +455,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -784,7 +784,7 @@
@@ -793,7 +793,7 @@
AC_SUBST(LN)
if test -z "$LN" ; then
case $ac_sys_system in
@@ -464,7 +464,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
CYGWIN*) LN="ln -s";;
atheos*) LN="ln -s";;
*) LN=ln;;
@@ -1681,7 +1681,7 @@
@@ -1766,7 +1766,7 @@
fi
fi
;;
@@ -473,7 +473,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
BSD/OS*/4*) LDSHARED="gcc -shared";;
FreeBSD*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
@@ -1735,7 +1735,7 @@
@@ -1820,7 +1820,7 @@
then CCSHARED="-fPIC";
else CCSHARED="+z";
fi;;
@@ -482,7 +482,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
OpenUNIX*|UnixWare*)
@@ -1768,7 +1768,7 @@
@@ -1853,7 +1853,7 @@
LINKFORSHARED="-Wl,-E -Wl,+s";;
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
@@ -491,7 +491,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
# -u _PyMac_Error is needed to pull in the mac toolbox glue,
@@ -1887,6 +1887,9 @@
@@ -1972,6 +1972,9 @@
BeOS*)
AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
;;
@@ -501,7 +501,7 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
esac
AC_MSG_CHECKING(for --with-libs)
@@ -3105,7 +3108,7 @@
@@ -3190,7 +3193,7 @@
AC_SUBST(LIBM)
case $ac_sys_system in
Darwin) ;;
@@ -510,20 +510,21 @@ diff -urN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in
*) LIBM=-lm
esac
AC_MSG_CHECKING(for --with-libm=STRING)
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 @@
diff -ruN Python-2.6.4/setup.py Python-2.6.4-haiku/setup.py
--- Python-2.6.4/setup.py 2009-10-08 03:48:32.000000000 -0600
+++ Python-2.6.4-haiku/setup.py 2009-10-27 13:33:59.000000000 -0600
@@ -382,6 +382,10 @@
inc_dirs += ['/system/include', '/atheos/autolnk/include']
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+ if platform == 'haiku1':
+ inc_dirs += ['/boot/develop/headers/posix']
+ inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty']
+ lib_dirs += ['/boot/system/lib']
+
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']
@@ -405,7 +408,7 @@
@@ -405,7 +409,7 @@
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
@@ -532,7 +533,7 @@ diff -urN Python-2.6.4/setup.py Python-2.6.4-haiku/setup.py
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -1065,7 +1068,7 @@
@@ -1065,7 +1069,7 @@
missing.append('resource')
# Sun yellow pages. Some systems have the functions in libc.