[patch] Python 3.4 updated patch

14_m68k-mint_freemint.patch (text/plain), 13.57 KB, created by Alan Hourihane on 2016-09-12 14:21:00 UTC

# HG changeset patch
# User Fabian Groffen <[e-mail]>
# Date 1388952378 -3600
#      Sun Jan 05 21:06:18 2014 +0100
# Branch 3.4
# Node ID cf6273056b9b2943984d6858a04bfe632a77f32b
# Parent  d6c9ea4cc81193b231be972e752436340c749aec
Patches for FreeMiNT, by Alan Hourihane,
https://bugs.gentoo.org/show_bug.cgi?id=484812
https://bugs.gentoo.org/show_bug.cgi?id=496850
https://bugs.gentoo.org/show_bug.cgi?id=507180

diff -r d6c9ea4cc811 -r cf6273056b9b Lib/stat.py
--- a/Lib/stat.py	Fri Jul 01 17:01:36 2016 +0200
+++ b/Lib/stat.py	Sun Jan 05 21:06:18 2014 +0100
@@ -37,9 +37,10 @@ S_IFDIR  = 0o040000  # directory
 S_IFCHR  = 0o020000  # character device
 S_IFBLK  = 0o060000  # block device
 S_IFREG  = 0o100000  # regular file
-S_IFIFO  = 0o010000  # fifo (named pipe)
-S_IFLNK  = 0o120000  # symbolic link
-S_IFSOCK = 0o140000  # socket file
+S_IFIFO  = 0o120000  # fifo (named pipe)
+S_IFLNK  = 0o160000  # symbolic link
+S_IFSOCK = 0o010000  # socket file
+
 
 # Functions to test for each file type
 
diff -r d6c9ea4cc811 -r cf6273056b9b Makefile.pre.in
--- a/Makefile.pre.in	Fri Jul 01 17:01:36 2016 +0200
+++ b/Makefile.pre.in	Sun Jan 05 21:06:18 2014 +0100
@@ -1355,6 +1355,7 @@ libainstall:	all python-config
 	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
 	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
 	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
+	sed -i -e "s/@LOCALMODLIBS@/${LOCALMODLIBS}/" Misc/python.pc
 	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
diff -r d6c9ea4cc811 -r cf6273056b9b Misc/python.pc.in
--- a/Misc/python.pc.in	Fri Jul 01 17:01:36 2016 +0200
+++ b/Misc/python.pc.in	Sun Jan 05 21:06:18 2014 +0100
@@ -8,6 +8,6 @@ Name: Python
 Description: Python library
 Requires: 
 Version: @VERSION@
-Libs.private: @LIBS@
 Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
+Libs.private: @LOCALMODLIBS@ @LIBS@
 Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
diff -r d6c9ea4cc811 -r cf6273056b9b Modules/Setup.dist
--- a/Modules/Setup.dist	Fri Jul 01 17:01:36 2016 +0200
+++ b/Modules/Setup.dist	Sun Jan 05 21:06:18 2014 +0100
@@ -120,7 +120,7 @@ atexit atexitmodule.c      # Register fu
 _stat _stat.c			# stat.h interface
 
 # access to ISO C locale support
-_locale _localemodule.c  # -lintl
+_locale _localemodule.c -lintl
 
 # Standard I/O baseline
 _io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
@@ -162,69 +162,70 @@ faulthandler faulthandler.c
 # it, depending on your system -- see the GNU readline instructions.
 # 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
-#_weakref _weakref.c	# basic weak reference support
-#_testcapi _testcapimodule.c    # Python C API test module
-#_random _randommodule.c	# Random number generator
-#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
-#_pickle _pickle.c	# pickle accelerator
-#_datetime _datetimemodule.c	# datetime accelerator
-#_bisect _bisectmodule.c	# Bisection algorithms
-#_heapq _heapqmodule.c	# Heap queue algorithm
+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
+_weakref _weakref.c	# basic weak reference support
+_testcapi _testcapimodule.c    # Python C API test module
+_random _randommodule.c	# Random number generator
+atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
+_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
+_pickle _pickle.c	# pickle accelerator
+_datetime _datetimemodule.c	# datetime accelerator
+_bisect _bisectmodule.c	# Bisection algorithms
+_heapq _heapqmodule.c	# Heap queue algorithm
 
-#unicodedata unicodedata.c    # static Unicode character database
+unicodedata unicodedata.c    # static Unicode character database
 
 
 # Modules with some UNIX dependencies -- on by default:
 # (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
+_socket socketmodule.c
 
 # Socket module helper for SSL support; you must comment out the other
 # socket line above, and possibly edit the SSL variable:
 #SSL=/usr/local/ssl
-#_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
 
-#_posixsubprocess _posixsubprocess.c  # POSIX subprocess module helper
+_posixsubprocess _posixsubprocess.c  # POSIX subprocess module helper
 
 # Multimedia modules -- off by default.
 # These don't work for 64-bit platforms!!!
@@ -240,14 +241,14 @@ faulthandler faulthandler.c
 # The _md5 module implements the RSA Data Security, Inc. MD5
 # Message-Digest Algorithm, described in RFC 1321.
 
-#_md5 md5module.c
+_md5 md5module.c
 
 
 # The _sha module implements the SHA checksum algorithms.
 # (NIST's Secure Hash Algorithms.)
-#_sha1 sha1module.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
+_sha1 sha1module.c
+_sha256 sha256module.c
+_sha512 sha512module.c
 
 
 # The _tkinter module.
@@ -294,7 +295,7 @@ faulthandler faulthandler.c
 #	-lX11
 
 # Lance Ellinghaus's syslog module
-#syslog syslogmodule.c		# syslog daemon interface
+syslog syslogmodule.c		# syslog daemon interface
 
 
 # Curses support, requiring the System V version of curses, often
@@ -303,9 +304,9 @@ faulthandler faulthandler.c
 #
 # 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 
 
 
 # Modules that provide persistent dictionary-like semantics.  You will
@@ -332,10 +333,10 @@ faulthandler faulthandler.c
 
 
 # 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
 
 
 # Lee Busby's SIGFPE modules.
@@ -371,22 +372,38 @@ faulthandler faulthandler.c
 #
 # 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 -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
+
+_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
+_lsprof _lsprof.c rotatingtree.c
+_hashlib _hashopenssl.c
+_multiprocessing _multiprocessing/multiprocessing.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
+xxlimited xxlimited.c
+_decimal -DANSI -DCONFIG_32 _decimal/_decimal.c _decimal/libmpdec/basearith.c _decimal/libmpdec/constants.c _decimal/libmpdec/context.c _decimal/libmpdec/convolute.c _decimal/libmpdec/crt.c _decimal/libmpdec/difradix2.c _decimal/libmpdec/fnt.c _decimal/libmpdec/fourstep.c _decimal/libmpdec/io.c _decimal/libmpdec/memory.c _decimal/libmpdec/mpdecimal.c _decimal/libmpdec/numbertheory.c _decimal/libmpdec/sixstep.c _decimal/libmpdec/transpose.c -I$(srcdir)/Modules/_decimal/libmpdec
+_lzma _lzmamodule.c -llzma
+_testbuffer _testbuffer.c
diff -r d6c9ea4cc811 -r cf6273056b9b Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c	Fri Jul 01 17:01:36 2016 +0200
+++ b/Modules/_testcapimodule.c	Sun Jan 05 21:06:18 2014 +0100
@@ -10,7 +10,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 d6c9ea4cc811 -r cf6273056b9b Modules/posixmodule.c
--- a/Modules/posixmodule.c	Fri Jul 01 17:01:36 2016 +0200
+++ b/Modules/posixmodule.c	Sun Jan 05 21:06:18 2014 +0100
@@ -9184,7 +9184,7 @@ posix_WSTOPSIG(PyObject *self, PyObject 
 #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 */
@@ -9234,7 +9234,9 @@ static PyObject*
 
     return v;
 }
-
+#endif
+
+#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.\n\
diff -r d6c9ea4cc811 -r cf6273056b9b Modules/python.c
--- a/Modules/python.c	Fri Jul 01 17:01:36 2016 +0200
+++ b/Modules/python.c	Sun Jan 05 21:06:18 2014 +0100
@@ -15,6 +15,10 @@ wmain(int argc, wchar_t **argv)
 }
 #else
 
+#ifdef atarist
+long _stksize = 512*1024;
+#endif
+
 int
 main(int argc, char **argv)
 {
diff -r d6c9ea4cc811 -r cf6273056b9b Python/pythonrun.c
--- a/Python/pythonrun.c	Fri Jul 01 17:01:36 2016 +0200
+++ b/Python/pythonrun.c	Sun Jan 05 21:06:18 2014 +0100
@@ -265,6 +265,8 @@ get_locale_encoding(void)
         return NULL;
     }
     return get_codec_name(codeset);
+#elif defined(__MINT__)
+    return get_codec_name("ASCII");
 #else
     PyErr_SetNone(PyExc_NotImplementedError);
     return NULL;
diff -r d6c9ea4cc811 -r cf6273056b9b setup.py
--- a/setup.py	Fri Jul 01 17:01:36 2016 +0200
+++ b/setup.py	Sun Jan 05 21:06:18 2014 +0100
@@ -620,7 +620,8 @@ class PyBuildExt(build_ext):
         exts.append( Extension('parser', ['parsermodule.c']) )
 
         # Memory-mapped files (also works on Win32).
-        exts.append( Extension('mmap', ['mmapmodule.c']) )
+        if host_platform != 'freemint1':
+            exts.append( Extension('mmap', ['mmapmodule.c']) )
 
         # Lance Ellinghaus's syslog module
         # syslog daemon interface
@@ -638,7 +639,8 @@ class PyBuildExt(build_ext):
         # Operations on audio samples
         # According to #993173, this one should actually work fine on
         # 64-bit platforms.
-        exts.append( Extension('audioop', ['audioop.c']) )
+        if host_platform != 'freemint1':
+            exts.append( Extension('audioop', ['audioop.c']) )
 
         # readline
         do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
@@ -1740,6 +1742,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')