unix: add Makefile dependency on Python support files

Previously, changes to triple specific Makefiles didn't result in
the Python build target being invalidated. Now it does.

Author: indygreg

cpython-unix/Makefile

@@ -249,6 +249,7 @@ $(OUTDIR)/zlib-$(ZLIB_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HE
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) zlib
 
 PYTHON_DEPENDS := \
+    $(PYTHON_SUPPORT_FILES) \
     $(if $(NEED_BDB),$(OUTDIR)/bdb-$(BDB_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_BZIP2),$(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_GDBM),$(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PACKAGE_SUFFIX).tar) \
@@ -264,9 +265,6 @@ PYTHON_DEPENDS := \
     $(if $(NEED_UUID),$(OUTDIR)/uuid-$(UUID_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_XZ),$(OUTDIR)/xz-$(XZ_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_ZLIB),$(OUTDIR)/zlib-$(ZLIB_VERSION)-$(PACKAGE_SUFFIX).tar) \
-    $(HERE)/disabled-static-modules.$(PYBUILD_PYTHON_MAJOR_VERSION).$(HOST_PLATFORM) \
-    $(HERE)/required-extensions.$(PYBUILD_PYTHON_MAJOR_VERSION).$(HOST_PLATFORM) \
-    $(HERE)/static-modules.$(PYBUILD_PYTHON_MAJOR_VERSION).$(HOST_PLATFORM) \
     $(NULL)
 
 ALL_PYTHON_DEPENDS = \

cpython-unix/build.py

@@ -979,7 +979,7 @@ def main():
     with log_path.open("wb") as log_fh:
         set_logger(action, log_fh)
         if action == "makefiles":
-            write_triples_makefiles(get_targets(TARGETS_CONFIG), BUILD)
+            write_triples_makefiles(get_targets(TARGETS_CONFIG), BUILD, SUPPORT)
             write_package_versions(BUILD / "versions")
 
         elif action.startswith("image-"):

pythonbuild/utils.py

@@ -127,7 +127,9 @@ def write_if_different(p: pathlib.Path, data: bytes):
             fh.write(data)
 
 
-def write_triples_makefiles(targets, dest_dir: pathlib.Path):
+def write_triples_makefiles(
+    targets, dest_dir: pathlib.Path, support_search_dir: pathlib.Path
+):
     """Write out makefiles containing make variable settings derived from config."""
     dest_dir.mkdir(parents=True, exist_ok=True)
 
@@ -152,6 +154,18 @@ def write_triples_makefiles(targets, dest_dir: pathlib.Path):
                 lines.append("DOCKER_IMAGE_BUILD := build%s\n" % image_suffix)
                 lines.append("DOCKER_IMAGE_XCB := xcb%s\n" % image_suffix)
 
+                for support_file in (
+                    "disabled-static-modules",
+                    "required-extensions",
+                    "static-modules",
+                ):
+                    path = get_target_support_file(
+                        support_search_dir, support_file, python, host_platform, triple
+                    )
+                    lines.append(
+                        "PYTHON_SUPPORT_FILES := $(PYTHON_SUPPORT_FILES) %s\n" % path
+                    )
+
                 write_if_different(makefile_path, "".join(lines).encode("ascii"))