From: Christian Heimes <christian@python.org>
Date: Wed, 16 Nov 2022 13:03:35 +0000 (+0100)
Subject: gh-96269: static and shared ext need different deps (#96316)
X-Git-Tag: v3.12.0a3~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33f42c269f1a80abba969b638a05a63fe2aeb0a4;p=thirdparty%2FPython%2Fcpython.git

gh-96269: static and shared ext need different deps (#96316)
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 90f5dd7964fe..e1910f6aab8c 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2572,7 +2572,9 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 ##########################################################################
 # Module dependencies and platform-specific files
 
-MODULE_DEPS=$(PYTHON_HEADERS) Modules/config.c $(EXPORTSYMS)
+# force rebuild when header file or module build flavor (static/shared) is changed
+MODULE_DEPS_STATIC=Modules/config.c
+MODULE_DEPS_SHARED=$(MODULE_DEPS_STATIC) $(EXPORTSYMS)
 
 MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
diff --git a/Modules/makesetup b/Modules/makesetup
index 5c275ac9a049..f000c9cd6731 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -262,12 +262,15 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			esac
 			# custom flags first, PY_STDMODULE_CFLAGS may contain -I with system libmpdec
 			case $doconfig in
-			no)	cc="$cc $cpps \$(PY_STDMODULE_CFLAGS) \$(CCSHARED)";;
+			no)
+				cc="$cc $cpps \$(PY_STDMODULE_CFLAGS) \$(CCSHARED)"
+				rule="$obj: $src \$(MODULE_${mods_upper}_DEPS) \$(MODULE_DEPS_SHARED) \$(PYTHON_HEADERS); $cc -c $src -o $obj"
+				;;
 			*)
-				cc="$cc $cpps \$(PY_BUILTIN_MODULE_CFLAGS)";;
+				cc="$cc $cpps \$(PY_BUILTIN_MODULE_CFLAGS)"
+				rule="$obj: $src \$(MODULE_${mods_upper}_DEPS) \$(MODULE_DEPS_STATIC) \$(PYTHON_HEADERS); $cc -c $src -o $obj"
+				;;
 			esac
-			# force rebuild when header file or module build flavor (static/shared) is changed
-			rule="$obj: $src \$(MODULE_${mods_upper}_DEPS) \$(MODULE_DEPS); $cc -c $src -o $obj"
 			echo "$rule" >>$rulesf
 		done
 		case $doconfig in