Remove memoryview object from the build.

oilshell · Aug 19, 2018 · 4b0650a36615958149b88f27c42889b920f82cc1 · 4b0650a
1 parent eaece7d
commit 4b0650a36615958149b88f27c42889b920f82cc1
Unified Split

Showing with 3 additions and 2 deletions.

+2 −0 Python-2.7.13/Objects/object.c

+1 −1 Python-2.7.13/Python/bltinmodule.c

+0 −1 build/compile.sh
diff --git a/Python-2.7.13/Objects/object.c b/Python-2.7.13/Objects/object.c
@@ -2152,8 +2152,10 @@ _Py_ReadyTypes(void)
    if (PyType_Ready(&PyProperty_Type) < 0)
        Py_FatalError("Can't initialize property type");

+#ifndef OVM_MAIN
    if (PyType_Ready(&PyMemoryView_Type) < 0)
        Py_FatalError("Can't initialize memoryview type");
+#endif

    if (PyType_Ready(&PyTuple_Type) < 0)
        Py_FatalError("Can't initialize tuple type");
diff --git a/Python-2.7.13/Python/bltinmodule.c b/Python-2.7.13/Python/bltinmodule.c
@@ -2716,8 +2716,8 @@ _PyBuiltin_Init(void)
    SETBUILTIN("True",                  Py_True);
    SETBUILTIN("basestring",            &PyBaseString_Type);
    SETBUILTIN("bool",                  &PyBool_Type);
-    SETBUILTIN("memoryview",        &PyMemoryView_Type);
 #ifndef OVM_MAIN
+    SETBUILTIN("memoryview",        &PyMemoryView_Type);
    SETBUILTIN("bytearray",             &PyByteArray_Type);
 #endif
    SETBUILTIN("bytes",                 &PyString_Type);
diff --git a/build/compile.sh b/build/compile.sh
@@ -77,7 +77,6 @@ Objects/iterobject.c
 Objects/listobject.c
 Objects/longobject.c
 Objects/dictobject.c
-Objects/memoryobject.c
 Objects/methodobject.c
 Objects/moduleobject.c
 Objects/object.c