gh-96269: Fix build dependency on AIX (GH-96304)

tiran · web-flow · commit 8c1dbad36f44 · 2022-08-26T12:31:58.000+02:00
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2522,6 +2522,8 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 ##########################################################################
 # Module dependencies and platform-specific files
 
+MODULE_DEPS=$(PYTHON_HEADERS) Modules/config.c $(EXPORTSYMS)
+
 MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
diff --git a/Misc/NEWS.d/next/Build/2022-08-26-11-50-03.gh-issue-96269.x_J5h0.rst b/Misc/NEWS.d/next/Build/2022-08-26-11-50-03.gh-issue-96269.x_J5h0.rst
@@ -0,0 +1,3 @@
+Shared module targets now depend on new ``MODULE_DEPS`` variable, which
+includes ``EXPORTSYMS``. This fixes a build order issue on unsupported AIX
+platform.
diff --git a/Modules/makesetup b/Modules/makesetup
@@ -267,7 +267,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 				cc="$cc $cpps \$(PY_BUILTIN_MODULE_CFLAGS)";;
 			esac
 			# force rebuild when header file or module build flavor (static/shared) is changed
-			rule="$obj: $src \$(MODULE_${mods_upper}_DEPS) \$(PYTHON_HEADERS) Modules/config.c; $cc -c $src -o $obj"
+			rule="$obj: $src \$(MODULE_${mods_upper}_DEPS) \$(MODULE_DEPS); $cc -c $src -o $obj"
 			echo "$rule" >>$rulesf
 		done
 		case $doconfig in

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Shared module targets now depend on new ``MODULE_DEPS`` variable, which
	`2`	+includes ``EXPORTSYMS``. This fixes a build order issue on unsupported AIX
	`3`	`+platform.`