build_os2emx.patch in issue 3868 - update OS/2 EMX makefile and config files

Part of source_os2emx.patch in issue 3868:
  Include/pystrcmp.h:  OS/2 has same C APIs as Windows
  Lib/test/test_io.py: OS/2 has same behaviour as Windows for this test

Reviewed by Amaury Forgeot d'Arc

diff --git a/Include/pystrcmp.h b/Include/pystrcmp.h
index edb12397e3cbcc761a5ba28221215a62193a48ba..369c7e77ff6bce8f36cc602616fb4361c99a16c8 100644 (file)
--- a/Include/pystrcmp.h
+++ b/Include/pystrcmp.h
@@ -8,7 +8,7 @@ extern "C" {
 PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
 PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) || defined(PYOS_OS2)
 #define PyOS_strnicmp strnicmp
 #define PyOS_stricmp stricmp
 #else

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 7fad7c79a3512872fa54a7e0d9237e6ea5d11211..9ef2a818b3d4aa11fea24548287f66c4ddf70c30 100644 (file)
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -201,7 +201,7 @@ class IOTest(unittest.TestCase):
         # On Windows and Mac OSX this test comsumes large resources; It takes
         # a long time to build the >2GB file and takes >2GB of disk space
         # therefore the resource must be enabled to run this test.
-        if sys.platform[:3] == 'win' or sys.platform == 'darwin':
+        if sys.platform[:3] in ('win', 'os2') or sys.platform == 'darwin':
             if not test_support.is_resource_enabled("largefile"):
                 print("\nTesting large file ops skipped on %s." % sys.platform,
                       file=sys.stderr)

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 2e9e50ee922502da7a902bae8ee6faebad295c7d..ff04f72cac85be05583561864cb189adc55707a1 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -287,7 +287,7 @@ SRC.MODULES=        $(addprefix $(TOP), \
                Modules/binascii.c \
                Modules/cmathmodule.c \
                Modules/_codecsmodule.c \
-               Modules/collectionsmodule.c \
+               Modules/_collectionsmodule.c \
                Modules/cPickle.c \
                Modules/cStringIO.c \
                Modules/_csv.c \
@@ -295,6 +295,7 @@ SRC.MODULES=        $(addprefix $(TOP), \
                Modules/dlmodule.c \
                Modules/errnomodule.c \
                Modules/fcntlmodule.c \
+               Modules/_fileio.c \
                Modules/_functoolsmodule.c \
                Modules/_heapqmodule.c \
                Modules/imageop.c \
@@ -305,7 +306,6 @@ SRC.MODULES=        $(addprefix $(TOP), \
                Modules/md5module.c \
                Modules/operator.c \
                Modules/_randommodule.c \
-               Modules/rgbimgmodule.c \
                Modules/shamodule.c \
                Modules/sha256module.c \
                Modules/sha512module.c \
@@ -343,6 +343,8 @@ SRC.PYTHON= $(addprefix $(TOP), \
                Python/compile.c \
                Python/codecs.c \
                Python/errors.c \
+               Python/formatter_string.c \
+               Python/formatter_unicode.c \
                Python/frozen.c \
                Python/frozenmain.c \
                Python/future.c \
@@ -359,8 +361,10 @@ SRC.PYTHON=        $(addprefix $(TOP), \
                Python/modsupport.c \
                Python/mysnprintf.c \
                Python/mystrtoul.c \
+               Python/peephole.c \
                Python/pyarena.c \
                Python/pyfpe.c \
+               Python/pymath.c \
                Python/pystate.c \
                Python/pystrtod.c \
                Python/pythonrun.c \
@@ -370,11 +374,14 @@ SRC.PYTHON=       $(addprefix $(TOP), \
                Python/traceback.c \
                Python/getopt.c \
                Python/dynload_shlib.c \
-               Python/thread.c)
+               Python/thread.c \
+               Python/_warnings.c)
 SRC.OBJECT=    $(addprefix $(TOP), \
                Objects/abstract.c \
                Objects/boolobject.c \
                Objects/bufferobject.c \
+               Objects/bytearrayobject.c \
+               Objects/bytes_methods.c \
                Objects/cellobject.c \
                Objects/classobject.c \
                Objects/cobject.c \

diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index 696c3bbc40aae6895d68870d6f09bbf182642bb1..408381c5631261c45523403ae8aa34d711d3110d 100644 (file)
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -52,12 +52,13 @@ extern void initarray();
 extern void initbinascii();
 extern void initcPickle();
 extern void initcStringIO();
-extern void initcollections();
+extern void init_collections();
 extern void initcmath();
 extern void initdatetime();
 extern void initdl();
 extern void initerrno();
 extern void initfcntl();
+extern void init_fileio();
 extern void init_functools();
 extern void init_heapq();
 extern void initimageop();
@@ -65,7 +66,6 @@ extern void inititertools();
 extern void initmath();
 extern void init_md5();
 extern void initoperator();
-extern void initrgbimg();
 extern void init_sha();
 extern void init_sha256();
 extern void init_sha512();
@@ -118,12 +118,13 @@ struct _inittab _PyImport_Inittab[] = {
        {"binascii", initbinascii},
        {"cPickle", initcPickle},
        {"cStringIO", initcStringIO},
-       {"collections", initcollections},
+       {"_collections", init_collections},
        {"cmath", initcmath},
        {"datetime", initdatetime},
        {"dl", initdl},
        {"errno", initerrno},
        {"fcntl", initfcntl},
+       {"_fileio", init_fileio},
        {"_functools", init_functools},
        {"_heapq", init_heapq},
        {"imageop", initimageop},
@@ -131,7 +132,6 @@ struct _inittab _PyImport_Inittab[] = {
        {"math", initmath},
        {"_md5", init_md5},
        {"operator", initoperator},
-       {"rgbimg", initrgbimg},
        {"_sha", init_sha},
        {"_sha256", init_sha256},
        {"_sha512", init_sha512},

diff --git a/PC/os2emx/pyconfig.h b/PC/os2emx/pyconfig.h
index 1039d3d523152e4fa679c284b448aa69375ae7a2..13910dc364c11afd44f7a09ebb0a00b612af8bf5 100644 (file)
--- a/PC/os2emx/pyconfig.h
+++ b/PC/os2emx/pyconfig.h
@@ -264,6 +264,9 @@ typedef long intptr_t;
 /* Define if you have the <conio.h> header file. */
 #undef HAVE_CONIO_H
 
+/* Define to 1 if you have the `copysign' function. */
+#define HAVE_COPYSIGN 1
+
 /* Define if you have the <direct.h> header file. */
 #undef HAVE_DIRECT_H