[patch] Python 2.7 updated patch

15_m68k-mint_mint.patch (text/plain), 11.65 KB, created by Alan Hourihane on 2016-09-12 14:21:22 UTC

# HG changeset patch
# User Alan Hourihane <[e-mail]>
# Date 1376942272 -7200
#      Mon Aug 19 21:57:52 2013 +0200
# Branch 2.7
# Node ID 70058028d963192818c38d20b471d0dfdde58b6a
# Parent  d2738d882177556a3409dc8ffb7f0cb06b38f4d7
Support for FreeMiNT by Alan Hourihane
http://bugs.gentoo.org/show_bug.cgi?id=347653

diff -r d2738d882177 -r 70058028d963 Lib/stat.py
--- a/Lib/stat.py	Fri Jul 01 16:55:37 2016 +0200
+++ b/Lib/stat.py	Mon Aug 19 21:57:52 2013 +0200
@@ -31,9 +31,9 @@ S_IFDIR  = 0040000
 S_IFCHR  = 0020000
 S_IFBLK  = 0060000
 S_IFREG  = 0100000
-S_IFIFO  = 0010000
-S_IFLNK  = 0120000
-S_IFSOCK = 0140000
+S_IFIFO  = 0120000
+S_IFLNK  = 0160000
+S_IFSOCK = 0010000
 
 # Functions to test for each file type
 
diff -r d2738d882177 -r 70058028d963 Modules/Setup.dist
--- a/Modules/Setup.dist	Fri Jul 01 16:55:37 2016 +0200
+++ b/Modules/Setup.dist	Mon Aug 19 21:57:52 2013 +0200
@@ -164,32 +164,33 @@ GLHACK=-Dclear=__GLclear
 # It's okay for this to be a shared library, too.
 
 #readline readline.c -lreadline -ltermcap
+readline readline.c -lreadline -lncurses
 
 
 # Modules that should always be present (non UNIX dependent):
 
-#array arraymodule.c	# array objects
-#cmath cmathmodule.c _math.c # -lm # complex math library functions
-#math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
-#_struct _struct.c	# binary structure packing/unpacking
-#time timemodule.c # -lm # time operations and variables
-#operator operator.c	# operator.add() and similar goodies
-#_testcapi _testcapimodule.c    # Python C API test module
-#_random _randommodule.c	# Random number generator
-#_collections _collectionsmodule.c # Container types
-#_heapq _heapqmodule.c		# Heapq type
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
-#strop stropmodule.c		# String manipulations
-#_functools _functoolsmodule.c	# Tools for working with functions and callable objects
-#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
+array arraymodule.c	# array objects
+cmath cmathmodule.c _math.c # -lm # complex math library functions
+math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
+_struct _struct.c	# binary structure packing/unpacking
+time timemodule.c # -lm # time operations and variables
+operator operator.c	# operator.add() and similar goodies
+_testcapi _testcapimodule.c    # Python C API test module
+_random _randommodule.c	# Random number generator
+_collections _collectionsmodule.c # Container types
+_heapq _heapqmodule.c		# Heapq type
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+strop stropmodule.c		# String manipulations
+_functools _functoolsmodule.c	# Tools for working with functions and callable objects
+_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
 #_pickle _pickle.c	# pickle accelerator
-#datetime datetimemodule.c	# date/time type
-#_bisect _bisectmodule.c	# Bisection algorithms
+datetime datetimemodule.c	# date/time type
+_bisect _bisectmodule.c	# Bisection algorithms
 
-#unicodedata unicodedata.c    # static Unicode character database
+unicodedata unicodedata.c    # static Unicode character database
 
 # access to ISO C locale support
-#_locale _localemodule.c  # -lintl
+_locale _localemodule.c -lintl
 
 # Standard I/O baseline
 #_io -I$(srcdir)/Modules/_io _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c
@@ -199,19 +200,19 @@ GLHACK=-Dclear=__GLclear
 # (If you have a really backward UNIX, select and socket may not be
 # supported...)
 
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-#spwd spwdmodule.c		# spwd(3) 
-#grp grpmodule.c		# grp(3)
-#select selectmodule.c	# select(2); not on ancient System V
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
+spwd spwdmodule.c		# spwd(3) 
+grp grpmodule.c		# grp(3)
+select selectmodule.c	# select(2); not on ancient System V
 
 # Memory-mapped files (also works on Win32).
 #mmap mmapmodule.c
 
 # CSV file helper
-#_csv _csv.c
+_csv _csv.c
 
 # Socket module helper for socket(2)
-#_socket socketmodule.c timemodule.c
+_socket socketmodule.c timemodule.c
 
 # Socket module helper for SSL support; you must comment out the other
 # socket line above, and possibly edit the SSL variable:
@@ -219,21 +220,24 @@ GLHACK=-Dclear=__GLclear
 #_ssl _ssl.c \
 #	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
 #	-L$(SSL)/lib -lssl -lcrypto
+_ssl _ssl.c \
+	-DUSE_SSL \
+	-lssl -lcrypto -lz
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
+crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
 # Some more UNIX dependent modules -- off by default, since these
 # are not supported by all UNIX systems:
 
 #nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
-#termios termios.c	# Steen Lumholt's termios module
-#resource resource.c	# Jeremy Hylton's rlimit interface
+termios termios.c	# Steen Lumholt's termios module
+resource resource.c	# Jeremy Hylton's rlimit interface
 
 
 # Multimedia modules -- off by default.
@@ -241,8 +245,8 @@ GLHACK=-Dclear=__GLclear
 # #993173 says audioop works on 64-bit platforms, though.
 # These represent audio samples or images as strings:
 
-#audioop audioop.c	# Operations on audio samples
-#imageop imageop.c	# Operations on images
+audioop audioop.c	# Operations on audio samples
+imageop imageop.c	# Operations on images
 
 
 # Note that the _md5 and _sha modules are normally only built if the
@@ -252,14 +256,14 @@ GLHACK=-Dclear=__GLclear
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5.c and md5.h are included here.
 
-#_md5 md5module.c md5.c
+_md5 md5module.c md5.c
 
 
 # The _sha module implements the SHA checksum algorithms.
 # (NIST's Secure Hash Algorithms.)
-#_sha shamodule.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
+_sha shamodule.c
+_sha256 sha256module.c
+_sha512 sha512module.c
 
 
 # SGI IRIX specific modules -- off by default.
@@ -311,7 +315,7 @@ GLHACK=-Dclear=__GLclear
 
 # George Neville-Neil's timing module:
 
-#timing timingmodule.c
+timing timingmodule.c
 
 
 # The _tkinter module.
@@ -358,7 +362,7 @@ GLHACK=-Dclear=__GLclear
 #	-lX11
 
 # Lance Ellinghaus's syslog module
-#syslog syslogmodule.c		# syslog daemon interface
+syslog syslogmodule.c		# syslog daemon interface
 
 
 # Curses support, requring the System V version of curses, often
@@ -367,9 +371,9 @@ GLHACK=-Dclear=__GLclear
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#_curses _cursesmodule.c -lcurses -ltermcap
+_curses _cursesmodule.c -lncurses
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses 
+_curses_panel _curses_panel.c -lpanel -lncurses 
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -434,14 +438,14 @@ GLHACK=-Dclear=__GLclear
 
 
 # Helper module for various ascii-encoders
-#binascii binascii.c
+binascii binascii.c
 
 # Fred Drake's interface to the Python parser
-#parser parsermodule.c
+parser parsermodule.c
 
 # cStringIO and cPickle
-#cStringIO cStringIO.c
-#cPickle cPickle.c
+cStringIO cStringIO.c
+cPickle cPickle.c
 
 
 # Lee Busby's SIGFPE modules.
@@ -477,23 +481,38 @@ GLHACK=-Dclear=__GLclear
 #
 # More information on Expat can be found at www.libexpat.org.
 #
-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
+pyexpat pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -lexpat 
 
 
 # Hye-Shik Chang's CJKCodecs
 
 # multibytecodec is required for all the other CJK codec modules
-#_multibytecodec cjkcodecs/multibytecodec.c
+_multibytecodec cjkcodecs/multibytecodec.c
 
-#_codecs_cn cjkcodecs/_codecs_cn.c
-#_codecs_hk cjkcodecs/_codecs_hk.c
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-#_codecs_jp cjkcodecs/_codecs_jp.c
-#_codecs_kr cjkcodecs/_codecs_kr.c
-#_codecs_tw cjkcodecs/_codecs_tw.c
+_codecs_cn cjkcodecs/_codecs_cn.c
+_codecs_hk cjkcodecs/_codecs_hk.c
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
+_codecs_jp cjkcodecs/_codecs_jp.c
+_codecs_kr cjkcodecs/_codecs_kr.c
+_codecs_tw cjkcodecs/_codecs_tw.c
 
 # Example -- included for reference only:
 # xx xxmodule.c
 
 # Another example -- the 'xxsubtype' module shows C-level subtyping in action
 xxsubtype xxsubtype.c
+
+datetime datetimemodule.c
+bz2 bz2module.c -lbz2
+zlib zlibmodule.c -lz
+posix posixmodule.c
+_io _io/_iomodule.c _io/stringio.c _io/fileio.c _io/textio.c _io/bytesio.c _io/bufferedio.c _io/iobase.c
+_json _json.c
+future_builtins future_builtins.c
+_lsprof _lsprof.c rotatingtree.c
+_hashlib _hashopenssl.c
+_hotshot _hotshot.c
+_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/socket_connection.c
+SQLITE3DEFS=-DSQLITE_OMIT_LOAD_EXTENSION=1
+SQLITE3MOD=-DMODULE_NAME='"sqlite3"'
+_sqlite3 $(SQLITE3DEFS) $(SQLITE3MOD) _sqlite/cache.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c -lsqlite3
diff -r d2738d882177 -r 70058028d963 Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c	Fri Jul 01 16:55:37 2016 +0200
+++ b/Modules/_testcapimodule.c	Mon Aug 19 21:57:52 2013 +0200
@@ -8,7 +8,17 @@
 #include "Python.h"
 #include <float.h>
 #include "structmember.h"
+
+/* Differentiate between building the core module and building extension
+ * modules.
+ */
+#ifdef Py_BUILD_CORE
+#undef Py_BUILD_CORE
 #include "datetime.h"
+#define Py_BUILD_CORE
+#else
+#include "datetime.h"
+#endif
 #include "marshal.h"
 
 #ifdef WITH_THREAD
diff -r d2738d882177 -r 70058028d963 Modules/python.c
--- a/Modules/python.c	Fri Jul 01 16:55:37 2016 +0200
+++ b/Modules/python.c	Mon Aug 19 21:57:52 2013 +0200
@@ -6,6 +6,10 @@
 #include <floatingpoint.h>
 #endif
 
+#ifdef atarist
+long _stksize = 512*1024;
+#endif
+
 int
 main(int argc, char **argv)
 {
diff -r d2738d882177 -r 70058028d963 setup.py
--- a/setup.py	Fri Jul 01 16:55:37 2016 +0200
+++ b/setup.py	Mon Aug 19 21:57:52 2013 +0200
@@ -630,7 +630,7 @@ class PyBuildExt(build_ext):
         exts.append( Extension('cPickle', ['cPickle.c']) )
 
         # Memory-mapped files (also works on Win32).
-        if host_platform not in ['atheos']:
+        if host_platform not in ['atheos', 'freemint1']:
             exts.append( Extension('mmap', ['mmapmodule.c']) )
         else:
             missing.append('mmap')
@@ -1888,6 +1888,9 @@ class PyBuildExt(build_ext):
                    '_ctypes/cfield.c']
         depends = ['_ctypes/ctypes.h']
 
+	if host_platform == 'freemint1':
+	   return
+
         if host_platform == 'darwin':
             sources.append('_ctypes/malloc_closure.c')
             sources.append('_ctypes/darwin/dlfcn_simple.c')
diff -r d2738d882177 -r 70058028d963 Modules/posixmodule.c
--- a/Modules/posixmodule.c.old	2016-09-09 15:58:47.000000000 +0000
+++ b/Modules/posixmodule.c	2016-09-09 16:09:19.000000000 +0000
@@ -7450,7 +7450,7 @@
 #endif /* HAVE_SYS_WAIT_H */
 
 
-#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
+#if (defined(HAVE_STATVFS) || defined(HAVE_FSTATVFS)) && defined(HAVE_SYS_STATVFS_H)
 #ifdef _SCO_DS
 /* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
    needed definitions in sys/statvfs.h */
@@ -7496,7 +7496,9 @@
 
     return v;
 }
+#endif /* HAVE_STATVFS && HAVE_SYS_STATVFS_H */
 
+#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
 PyDoc_STRVAR(posix_fstatvfs__doc__,
 "fstatvfs(fd) -> statvfs result\n\n\
 Perform an fstatvfs system call on the given fd.");