Remove plenty of makefile misconfigurations

third_party/python/Lib/test/support/__init__.py

@@ -1049,7 +1049,7 @@ def temp_cwd(name='tempcwd', quiet=False):
     only a warning is raised and the original CWD is used.
 
     """
-    with temp_dir(path=name, quiet=quiet) as temp_path:
+    with temp_dir(quiet=quiet) as temp_path:
         with change_cwd(temp_path, quiet=quiet) as cwd_dir:
             yield cwd_dir
 

third_party/python/Lib/test/test_tarfile.py

@@ -2607,8 +2607,9 @@ class NumericOwnerTest(unittest.TestCase):
     #  because the uname and gname in the test file are 'root', and extract()
     #  will look them up using pwd and grp to find their uid and gid, which we
     #  test here to be 0.
-    @unittest.skipUnless(root_is_uid_gid_0(),
-                         'uid=0,gid=0 must be named "root"')
+    # [jart] tests shouldn't read /etc/passwd lool
+    # @unittest.skipUnless(root_is_uid_gid_0(),
+    #                      'uid=0,gid=0 must be named "root"')
     @unittest.mock.patch('os.chown')
     @unittest.mock.patch('os.chmod')
     @unittest.mock.patch('os.geteuid')

third_party/python/Modules/_elementtree.c

@@ -17,12 +17,14 @@
 #include "third_party/python/Include/object.h"
 #include "third_party/python/Include/objimpl.h"
 #include "third_party/python/Include/pycapsule.h"
+#include "third_party/python/Include/pyexpat.h"
 #include "third_party/python/Include/pyhash.h"
 #include "third_party/python/Include/pystate.h"
 #include "third_party/python/Include/sliceobject.h"
 #include "third_party/python/Include/structmember.h"
 #include "third_party/python/Include/warnings.h"
 #include "third_party/python/Include/yoink.h"
+#include "third_party/python/Modules/expat/expat.h"
 /* clang-format off */
 
 PYTHON_PROVIDE("_elementtree");
@@ -2772,9 +2774,6 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject *self, PyObject *tag,
 /* ==================================================================== */
 /* the expat interface */
 
-#include "third_party/python/Modules/expat/expat.h"
-#include "third_party/python/Include/pyexpat.h"
-
 /* The PyExpat_CAPI structure is an immutable dispatch table, so it can be
  * cached globally without being in per-module state.
  */

third_party/python/Objects/typeobject.c

@@ -33,6 +33,11 @@
 #include "third_party/python/Include/weakrefobject.h"
 /* clang-format off */
 
+static const short slotoffsets[] = {
+    -1, /* invalid slot */
+#include "third_party/python/Objects/typeslots.inc"
+};
+
 /* Type object implementation */
 
 /* Support type attribute cache */
@@ -2791,11 +2796,6 @@ error:
     return NULL;
 }
 
-static const short slotoffsets[] = {
-    -1, /* invalid slot */
-#include "typeslots.inc"
-};
-
 PyObject *
 PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
 {

third_party/python/python.mk

@@ -4194,6 +4194,39 @@ $(THIRD_PARTY_PYTHON_PYTEST_A_DATA_OBJS): ZIPOBJ_FLAGS += -P.python -C3
 o/$(MODE)/third_party/python/Python/ceval.o: QUOTA = -C64 -M1024m -L300
 o/$(MODE)/third_party/python/Objects/unicodeobject.o: QUOTA += -C64 -M1024m -L300
 
+o/$(MODE)/third_party/python/Objects/unicodeobject.o:			\
+		third_party/python/Objects/unicodeobject.c		\
+		third_party/python/Objects/stringlib/localeutil.inc	\
+		third_party/python/Objects/stringlib/unicode_format.inc	\
+		third_party/python/Objects/stringlib/asciilib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs1lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs2lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs4lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc
+
+o/$(MODE)/third_party/python/Modules/_elementtree.o:			\
+		third_party/python/Modules/_elementtree.c		\
+		third_party/python/Modules/clinic/_elementtree.inc
+
+o/$(MODE)/third_party/python/Modules/_io/bufferedio.o:			\
+		third_party/python/Modules/_io/bufferedio.c		\
+		third_party/python/Modules/_io/clinic/bufferedio.inc
+
+o/$(MODE)/third_party/python/Modules/_io/textio.o:			\
+		third_party/python/Modules/_io/textio.c			\
+		third_party/python/Modules/_io/clinic/textio.inc
+
+o/$(MODE)/third_party/python/Modules/_sre.o:				\
+		third_party/python/Modules/_sre.c			\
+		third_party/python/Modules/clinic/_sre.inc
+
 o/$(MODE)/third_party/python/Parser/asdl_c.o: PYFLAGS += -m
 $(THIRD_PARTY_PYTHON_PYTEST_PYMAINS_OBJS): PYFLAGS += -t -P.python -C3
 $(THIRD_PARTY_PYTHON_PYTEST_TODOS:%.py=o/$(MODE)/%.o): PYFLAGS += -t -P.python -C3
@@ -4348,7 +4381,6 @@ o/$(MODE)/third_party/python/chibicc.inc:				\
 		libc/nexgen32e/kcpuids.h				\
 		libc/runtime/runtime.h					\
 		libc/runtime/symbolic.h					\
-		libc/runtime/valist.h					\
 		libc/stdio/stdio.h					\
 		libc/str/str.h						\
 		libc/unicode/unicode.h					\