lang/python27

This commit is contained in:
Lionel Sambuc 2014-04-19 16:06:28 +02:00
parent 2dcd5e8601
commit 4eea737101
15 changed files with 248 additions and 88 deletions

View File

@ -30,11 +30,17 @@ CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
CONFIGURE_ARGS+= --without-threads
.else
PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
.endif
.endif
.include "../../mk/compiler.mk"
@ -43,8 +49,6 @@ CONFIGURE_ARGS+= --with-pth
CFLAGS+= -fwrapv
.endif
.include "../../mk/bsd.prefs.mk"
# fdatasync()
LIBS.SunOS+= -lrt
@ -75,6 +79,8 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
PY_PLATNAME= hp-ux11
.elif ${OPSYS} == "Linux"
PY_PLATNAME= linux2
.elif ${OS_VARIANT} == "Minix"
PY_PLATNAME= minix3
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
@ -120,7 +126,8 @@ PLIST.nis= yes
. endif
.else
PLIST.dll= yes
. if ${OPSYS} == "MirBSD"
. if ${OPSYS} == "MirBSD" ||\
(${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix")
# neither nis nor no-nis
. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
PLIST.nis= yes

View File

@ -1821,7 +1821,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_locale.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_multiprocessing.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
@ -1844,14 +1843,11 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so
lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so

View File

@ -9,14 +9,14 @@ SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063
SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc
SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3
SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451
SHA1 (patch-Modules_socketmodule.c) = 07c76dcf6dc8605446bc8e01d80e1f1e30a5ebf7
SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
SHA1 (patch-Modules_socketmodule.c) = b6c80063056ac24186ad9354426b220fa6f99535
SHA1 (patch-aa) = f59154104088042b2d9a1d83c73e2f6f2da33524
SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590
SHA1 (patch-ah) = 5e882431fe249077c54232db06259f08d0e3c706
SHA1 (patch-al) = e310b0a3f3180c72b565faef7fb6ab4e736617d6
SHA1 (patch-am) = 2ee4a6450d03101d098c23eea87e3dcdef322842
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
@ -24,5 +24,11 @@ SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498
SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582
SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34
SHA1 (patch-pyconfig.h.in) = 3bd9cfb0ab6779aba5bb9e149c42b8169c18876e
SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
SHA1 (patch-xb) = 99a37f472330bbacffd3816b867f9b20885ffa5f
SHA1 (patch-xc) = 9a9a850f15f41495b375ca4b6eb566485cfb2786
SHA1 (patch-xd) = 6cfce12b11aec946b52e2d1aad8d603b95aaec87
SHA1 (patch-xe) = 7f4d5dcf68ec974a4e0c71367c7058d46cf2e975
SHA1 (patch-xf) = 5297f2da280077706bf5417ff735b9ed01b6e9e6
SHA1 (patch-xg) = 1b73ec484807f23d7767be600997c7881fc57709

View File

@ -1,12 +1,51 @@
$NetBSD: patch-Modules_socketmodule.c,v 1.1 2014/02/09 09:02:50 tron Exp $
--- Modules/socketmodule.c.orig Sun Nov 10 07:36:41 2013
+++ Modules/socketmodule.c Fri Apr 18 18:50:49 2014
@@ -182,7 +182,7 @@ shutdown(how) -- shut down traffic in one or both dire
(this includes the getaddrinfo emulation) protect access with a lock. */
#if defined(WITH_THREAD) && (defined(__APPLE__) || \
(defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \
- defined(__OpenBSD__) || defined(__NetBSD__) || \
+ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__minix) || \
defined(__VMS) || !defined(HAVE_GETADDRINFO))
#define USE_GETADDRINFO_LOCK
#endif
@@ -380,7 +380,7 @@ const char *inet_ntop(int af, const void *src, char *d
#define SOCKETCLOSE close
#endif
Fix vulnerability reported in SA56624. Patch taken from here:
-#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__) && !defined(__DragonFly__)
+#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__minix)
#define USE_BLUETOOTH 1
#if defined(__FreeBSD__)
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
@@ -394,7 +394,7 @@ const char *inet_ntop(int af, const void *src, char *d
#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
-#elif defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix)
#define sockaddr_l2 sockaddr_bt
#define sockaddr_rc sockaddr_bt
#define sockaddr_hci sockaddr_bt
@@ -1132,7 +1132,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int ad
case BTPROTO_HCI:
{
struct sockaddr_hci *a = (struct sockaddr_hci *) addr;
-#if defined(__NetBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix)
return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
#else
PyObject *ret = NULL;
@@ -1429,7 +1429,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
case BTPROTO_HCI:
{
struct sockaddr_hci *addr = (struct sockaddr_hci *)addr_ret;
-#if defined(__NetBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix)
char *straddr = PyBytes_AS_STRING(args);
http://hg.python.org/cpython/rev/87673659d8f7
--- Modules/socketmodule.c.orig 2013-11-10 07:36:41.000000000 +0000
+++ Modules/socketmodule.c 2014-02-09 08:41:25.000000000 +0000
@@ -2742,6 +2742,10 @@
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s, PyObject *ar
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
@ -17,3 +56,17 @@ http://hg.python.org/cpython/rev/87673659d8f7
}
readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
@@ -4772,11 +4776,11 @@ init_socket(void)
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
-#if !defined(__NetBSD__) && !defined(__DragonFly__)
+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__minix)
PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
#endif
#if !defined(__FreeBSD__)
-#if !defined(__NetBSD__) && !defined(__DragonFly__)
+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__minix)
PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
#endif
PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);

View File

@ -1,12 +1,10 @@
$NetBSD: patch-aa,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
--- Include/py_curses.h.orig 2010-03-25 00:54:54.000000000 +0000
+++ Include/py_curses.h
--- Include/py_curses.h.orig Sun Nov 10 07:36:39 2013
+++ Include/py_curses.h Fri Apr 18 18:45:25 2014
@@ -44,6 +44,21 @@
#endif
#endif
+#ifdef __NetBSD__
+#if defined __NetBSD__ || defined __minix
+/*
+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
+** against multiple definition of wchar_t and wint_t.

View File

@ -1,8 +1,6 @@
$NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
--- Modules/_cursesmodule.c.orig 2013-04-06 14:02:36.000000000 +0000
+++ Modules/_cursesmodule.c
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary
--- Modules/_cursesmodule.c.orig Sun Nov 10 07:36:41 2013
+++ Modules/_cursesmodule.c Fri Apr 18 18:55:20 2014
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getparyx, int, "ii")
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@ -20,7 +18,16 @@ $NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
@@ -2110,7 +2102,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
@@ -893,7 +885,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyOb
return Py_BuildValue("c", rtn);
} else {
const char *knp;
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__minix)
knp = unctrl(rtn);
#else
knp = keyname(rtn);
@@ -2110,7 +2102,6 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *arg
}
#endif /* HAVE_CURSES_IS_TERM_RESIZED */
@ -28,7 +35,7 @@ $NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
@@ -2129,7 +2120,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
@@ -2129,7 +2120,6 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
}
@ -36,7 +43,7 @@ $NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
static PyObject *
PyCurses_KillChar(PyObject *self)
@@ -2674,9 +2664,7 @@ static PyMethodDef PyCurses_methods[] =
@@ -2674,9 +2664,7 @@ static PyMethodDef PyCurses_methods[] = {
#ifdef HAVE_CURSES_IS_TERM_RESIZED
{"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
#endif

View File

@ -1,14 +1,6 @@
$NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
- don't set Mac OS X target version: stick to the current one
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
--- configure.orig 2013-04-06 14:02:41.000000000 +0000
+++ configure
@@ -3243,7 +3243,7 @@ case $ac_sys_system/$ac_sys_release in
--- configure.orig Sun Nov 10 07:36:41 2013
+++ configure Fri Apr 18 17:50:36 2014
@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
# OpenBSD 4.6, but is fixed in 4.7.
@ -17,12 +9,12 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
define_xopen_source=no
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE
@@ -5342,15 +5342,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
+ Linux*|GNU*|Minix*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@ -34,7 +26,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -6037,7 +6032,7 @@ $as_echo "$CC" >&6; }
@@ -6046,7 +6041,7 @@ $as_echo "$CC" >&6; }
# Calculate the right deployment target for this build.
#
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
@ -43,7 +35,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
cur_target=10.3
if test ${enable_universalsdk}; then
if test "${UNIVERSAL_ARCHS}" = "all"; then
@@ -8214,9 +8209,9 @@ then
@@ -8222,9 +8217,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@ -56,7 +48,7 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
@@ -8240,15 +8235,15 @@ then
@@ -8248,15 +8243,15 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@ -76,14 +68,15 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
@@ -8276,9 +8271,15 @@ then
@@ -8284,9 +8279,15 @@ then
;;
esac
fi;;
- NetBSD*|DragonFly*)
+ MirBSD*)
+ LDSHARED='$(CC) -shared $(CCSHARED)'
+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
NetBSD*|DragonFly*)
+ Minix*|NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
+ Interix*)
@ -92,22 +85,22 @@ $NetBSD: patch-al,v 1.11 2013/09/13 13:18:20 adam Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes" ; then
LDSHARED='$(CC) -shared'
@@ -8322,7 +8323,8 @@ then
@@ -8330,7 +8331,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
+ FreeBSD*|Minix*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
+ Interix*) CCSHARED="";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
@@ -8374,11 +8376,12 @@ then
@@ -8382,11 +8384,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
+ FreeBSD*|Minix*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
LINKFORSHARED="-Wl,--export-dynamic"

View File

@ -1,28 +1,5 @@
$NetBSD: patch-am,v 1.14 2014/03/27 05:36:37 obache Exp $
Disabled modules for normal build:
bsddb
curses
curses_panel
elementtree
sqlite3
tkinter
gdbm
pyexpat
readline
{linux,oss,sun}audiodev
spwd
Those have separate packages where needed.
Only check the BUILDLINK_DIR for libraries etc, do not pick up random
headers and libraries from the system.
Build the 1.85 compat module all the time against the BDB version of choice.
cygwin 2.7.3-no-libm.patch
--- setup.py.orig 2013-11-10 07:36:41.000000000 +0000
+++ setup.py
--- setup.py.orig Sun Nov 10 07:36:41 2013
+++ setup.py Fri Apr 18 17:45:56 2014
@@ -33,7 +33,7 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@ -348,7 +325,18 @@ cygwin 2.7.3-no-libm.patch
if dbmext is not None:
exts.append(dbmext)
else:
@@ -2222,9 +2056,9 @@ def main():
@@ -1555,6 +1389,10 @@ class PyBuildExt(build_ext):
macros = dict()
libraries = []
+ elif host_platform.startswith('minix'):
+ macros = dict()
+ libraries = []
+
elif host_platform.startswith('netbsd'):
macros = dict()
libraries = []
@@ -2222,9 +2060,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install

View File

@ -1,8 +1,6 @@
$NetBSD: patch-pyconfig.h.in,v 1.2 2013/04/12 09:03:41 adam Exp $
--- pyconfig.h.in.orig 2011-06-11 17:46:28.000000000 +0200
+++ pyconfig.h.in 2011-11-29 20:17:04.328552361 +0100
@@ -1191,7 +1191,9 @@
--- pyconfig.h.in.orig Sun Nov 10 07:36:41 2013
+++ pyconfig.h.in Fri Apr 18 17:38:30 2014
@@ -1197,7 +1197,9 @@
#undef _UINT64_T
/* Define to the level of X/Open that your system supports */

View File

@ -0,0 +1,11 @@
--- Python/dynload_shlib.c.orig Fri Apr 18 18:42:43 2014
+++ Python/dynload_shlib.c Fri Apr 18 18:43:00 2014
@@ -7,7 +7,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__minix)
#include <sys/param.h>
#if (NetBSD < 199712)
#include <nlist.h>

View File

@ -0,0 +1,12 @@
--- Modules/posixmodule.c.orig Fri Apr 18 18:53:21 2014
+++ Modules/posixmodule.c Fri Apr 18 18:53:52 2014
@@ -2098,7 +2098,8 @@ Return a string representing the current working direc
#if (defined(__sun) && defined(__SVR4)) || \
defined(__OpenBSD__) || \
- defined(__NetBSD__)
+ defined(__NetBSD__) || \
+ defined(__minix)
/* Issue 9185: getcwd() returns NULL/ERANGE indefinitely. */
static PyObject *
posix_getcwd(PyObject *self, PyObject *noargs)

View File

@ -0,0 +1,56 @@
--- Modules/_ctypes/libffi/configure.orig Fri Apr 18 19:00:20 2014
+++ Modules/_ctypes/libffi/configure Fri Apr 18 19:01:54 2014
@@ -5313,7 +5313,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5811,7 +5811,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+minix* | netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -9440,7 +9440,7 @@ _LT_EOF
fi
;;
- netbsd*)
+ minix* | netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10070,7 +10070,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd*)
+ minix* | netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -11101,6 +11101,17 @@ fi
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
;;
+
+minix*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Minix ld.elf_so'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
netbsd*)
version_type=sunos

View File

@ -0,0 +1,11 @@
--- Modules/_ctypes/libffi/ltmain.sh.orig Fri Apr 18 19:11:06 2014
+++ Modules/_ctypes/libffi/ltmain.sh Fri Apr 18 19:11:33 2014
@@ -7627,7 +7627,7 @@ func_mode_link ()
# Rhapsody C library is in the System framework
func_append deplibs " System.ltframework"
;;
- *-*-netbsd*)
+ *-*-netbsd* | *-*-minix*)
# Don't link with libc until the a.out ld.so is fixed.
;;
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)

View File

@ -0,0 +1,13 @@
--- Modules/_ctypes/libffi/config.guess.orig Fri Apr 18 19:06:10 2014
+++ Modules/_ctypes/libffi/config.guess Fri Apr 18 19:06:27 2014
@@ -863,8 +863,8 @@ EOF
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ *:Minix:*:*)
+ echo ${UNAME_MACHINE}-elf32-minix
exit ;;
aarch64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu

View File

@ -0,0 +1,11 @@
--- Modules/_ctypes/libffi/src/dlmalloc.c.orig Fri Apr 18 19:08:34 2014
+++ Modules/_ctypes/libffi/src/dlmalloc.c Fri Apr 18 19:08:56 2014
@@ -1200,7 +1200,7 @@ int mspace_mallopt(int, int);
#ifndef LACKS_UNISTD_H
#include <unistd.h> /* for sbrk */
#else /* LACKS_UNISTD_H */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__minix)
extern void* sbrk(ptrdiff_t);
#endif /* FreeBSD etc */
#endif /* LACKS_UNISTD_H */