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

python 2.6.8: Fix python-config

Browse Source 
Python was looking for its config header in the wrong directory
(<prefix>/include).
This commit is contained in:
Ingo Weinhold
2013-05-04 00:47:58 +02:00
parent ee6358786c
commit 3d40334ec5
2 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
dev-lang/python/patches/python-2.6.8.patch
View File

@@ -1,6 +1,6 @@
diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in
--- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.057409536 +0200
+++ Python-2.6.8/configure.in 2013-05-03 15:23:53.332922880 +0200
--- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.008650752 +0200
+++ Python-2.6.8/configure.in 2013-05-04 00:18:11.912523264 +0200
@@ -745,7 +745,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
@@ -76,8 +76,8 @@ diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in
esac
AC_MSG_CHECKING(for --with-libm=STRING)
diff -urN orig/Python-2.6.8/Lib/distutils/command/build_ext.py Python-2.6.8/Lib/distutils/command/build_ext.py
--- orig/Python-2.6.8/Lib/distutils/command/build_ext.py 2012-04-10 17:32:04.066846720 +0200
+++ Python-2.6.8/Lib/distutils/command/build_ext.py 2013-05-03 15:23:53.334233600 +0200
--- orig/Python-2.6.8/Lib/distutils/command/build_ext.py 2012-04-10 17:32:04.018087936 +0200
+++ Python-2.6.8/Lib/distutils/command/build_ext.py 2013-05-04 00:18:11.913833984 +0200
@@ -234,9 +234,13 @@
# for extensions under Linux or Solaris with a shared Python library,
@@ -93,9 +93,22 @@ diff -urN orig/Python-2.6.8/Lib/distutils/command/build_ext.py Python-2.6.8/Lib/
and sysconfig.get_config_var('Py_ENABLE_SHARED')):
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions
diff -urN orig/Python-2.6.8/Lib/distutils/sysconfig.py Python-2.6.8/Lib/distutils/sysconfig.py
--- orig/Python-2.6.8/Lib/distutils/sysconfig.py 2012-04-10 17:32:04.014942208 +0200
+++ Python-2.6.8/Lib/distutils/sysconfig.py 2013-05-04 00:31:41.977534976 +0200
@@ -85,7 +85,8 @@
# Include is located in the srcdir
inc_dir = os.path.join(srcdir, "Include")
return inc_dir
- return os.path.join(prefix, "include", "python" + get_python_version())
+ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers"
+ return os.path.join(prefix, inc_dir, "python" + get_python_version())
elif os.name == "nt":
return os.path.join(prefix, "include")
elif os.name == "mac":
diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/IN.py
--- orig/Python-2.6.8/Lib/plat-haiku1/IN.py 1970-01-01 01:00:00.000000000 +0100
+++ Python-2.6.8/Lib/plat-haiku1/IN.py 2013-05-03 15:23:53.336330752 +0200
+++ Python-2.6.8/Lib/plat-haiku1/IN.py 2013-05-04 00:18:11.917766144 +0200
@@ -0,0 +1,327 @@
+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h
+
@@ -426,7 +439,7 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/I
+def _FDBITNO(fd): return ((fd) % NFDBITS)
diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/regen
--- orig/Python-2.6.8/Lib/plat-haiku1/regen 1970-01-01 01:00:00.000000000 +0100
+++ Python-2.6.8/Lib/plat-haiku1/regen 2013-05-03 15:23:53.336855040 +0200
+++ Python-2.6.8/Lib/plat-haiku1/regen 2013-05-04 00:18:11.918552576 +0200
@@ -0,0 +1,7 @@
+#! /bin/sh
+
@@ -436,8 +449,8 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/r
+set -v
+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_fileio.py
--- orig/Python-2.6.8/Lib/test/test_fileio.py 2012-04-10 17:32:07.043515904 +0200
+++ Python-2.6.8/Lib/test/test_fileio.py 2013-05-03 15:23:53.338952192 +0200
--- orig/Python-2.6.8/Lib/test/test_fileio.py 2012-04-10 17:32:07.061865984 +0200
+++ Python-2.6.8/Lib/test/test_fileio.py 2013-05-04 00:18:11.920911872 +0200
@@ -152,6 +152,7 @@
self.assertEquals(f.writable(), True)
if sys.platform != "darwin" and \
@@ -447,8 +460,8 @@ diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_f
# Somehow /dev/tty appears seekable on some BSDs
self.assertEquals(f.seekable(), False)
diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in
--- orig/Python-2.6.8/Makefile.pre.in 2012-04-10 17:32:08.047448064 +0200
+++ Python-2.6.8/Makefile.pre.in 2013-05-03 15:23:53.340000768 +0200
--- orig/Python-2.6.8/Makefile.pre.in 2012-04-10 17:32:08.065798144 +0200
+++ Python-2.6.8/Makefile.pre.in 2013-05-04 00:18:11.922222592 +0200
@@ -90,7 +90,7 @@
LIBDIR= @libdir@
MANDIR= @mandir@
@@ -459,8 +472,8 @@ diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in
# Detailed destination directories
diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c
--- orig/Python-2.6.8/Modules/bz2module.c 2012-04-10 17:32:09.031457280 +0200
+++ Python-2.6.8/Modules/bz2module.c 2013-05-03 15:28:16.616562688 +0200
--- orig/Python-2.6.8/Modules/bz2module.c 2012-04-10 17:32:09.049545216 +0200
+++ Python-2.6.8/Modules/bz2module.c 2013-05-04 00:18:11.923533312 +0200
@@ -9,7 +9,7 @@
#include "Python.h"
@@ -471,8 +484,8 @@ diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c
#ifdef WITH_THREAD
diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c
--- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.057147392 +0200
+++ Python-2.6.8/Modules/resource.c 2013-05-03 15:23:53.340787200 +0200
--- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.008388608 +0200
+++ Python-2.6.8/Modules/resource.c 2013-05-04 00:18:11.926679040 +0200
@@ -86,6 +86,7 @@
PyFloat_FromDouble(doubletime(ru.ru_utime)));
PyStructSequence_SET_ITEM(result, 1,
@@ -491,8 +504,8 @@ diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c
Py_DECREF(result);
return NULL;
diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmodule.c
--- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.066846720 +0200
+++ Python-2.6.8/Modules/socketmodule.c 2013-05-03 15:23:53.342622208 +0200
--- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.017825792 +0200
+++ Python-2.6.8/Modules/socketmodule.c 2013-05-04 00:18:11.929824768 +0200
@@ -4661,7 +4661,9 @@
#ifndef __BEOS__
/* We have incomplete socket support. */
@@ -505,8 +518,8 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmo
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
#endif
diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmodule.h
--- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.006029312 +0200
+++ Python-2.6.8/Modules/socketmodule.h 2013-05-03 15:23:53.343146496 +0200
--- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.024379392 +0200
+++ Python-2.6.8/Modules/socketmodule.h 2013-05-04 00:18:11.930349056 +0200
@@ -47,6 +47,10 @@
# undef AF_NETLINK
#endif
@@ -519,8 +532,8 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmo
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule.c
--- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.033554432 +0200
+++ Python-2.6.8/Modules/spwdmodule.c 2013-05-03 15:23:53.343670784 +0200
--- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.051904512 +0200
+++ Python-2.6.8/Modules/spwdmodule.c 2013-05-04 00:18:11.932446208 +0200
@@ -79,7 +79,9 @@
SETS(setIndex++, p->sp_namp);
@@ -532,8 +545,8 @@ diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule.c
--- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.047710208 +0200
+++ Python-2.6.8/Python/bltinmodule.c 2013-05-03 15:23:53.344981504 +0200
--- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.066060288 +0200
+++ Python-2.6.8/Python/bltinmodule.c 2013-05-04 00:18:11.936378368 +0200
@@ -18,7 +18,7 @@
*/
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
@@ -544,8 +557,8 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule
#else
const char *Py_FileSystemDefaultEncoding = NULL; /* use default */
diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
--- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.057147392 +0200
+++ Python-2.6.8/setup.py 2013-05-03 15:23:53.346816512 +0200
--- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200
+++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200
@@ -428,6 +428,10 @@
inc_dirs += ['/system/include', '/atheos/autolnk/include']
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
@@ -624,8 +637,8 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py
if (self.compiler.find_library_file(lib_dirs, 'nsl')):
libs = ['nsl']
diff -urN orig/Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8/Tools/scripts/h2py.py
--- orig/Python-2.6.8/Tools/scripts/h2py.py 2012-04-10 17:32:11.043253760 +0200
+++ Python-2.6.8/Tools/scripts/h2py.py 2013-05-03 15:23:53.347340800 +0200
--- orig/Python-2.6.8/Tools/scripts/h2py.py 2012-04-10 17:32:11.061603840 +0200
+++ Python-2.6.8/Tools/scripts/h2py.py 2013-05-04 00:18:11.939261952 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /bin/env python