From: Christian Heimes <christian@python.org>
Date: Tue, 14 Dec 2021 14:42:46 +0000 (+0200)
Subject: bpo-46023: Skip build if module is marked as DISABLED (GH-30100)
X-Git-Tag: v3.11.0a4~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74821b30539bba3cf0ac4148923ec0e9b826508e;p=thirdparty%2FPython%2Fcpython.git

bpo-46023: Skip build if module is marked as DISABLED (GH-30100)
---

diff --git a/Modules/Setup.bootstrap b/Modules/Setup.bootstrap
index d543f087b89f..f23da60b37ad 100644
--- a/Modules/Setup.bootstrap
+++ b/Modules/Setup.bootstrap
@@ -3,6 +3,7 @@
 # ---
 # Built-in modules required to get a functioning interpreter;
 # cannot be built as shared!
+*static*
 
 # module C APIs are used in core
 atexit atexitmodule.c
diff --git a/Modules/makesetup b/Modules/makesetup
index 6d83b8f0cbb7..3909650ed7c4 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -207,7 +207,10 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			libs="\$(MODULE_${mods_upper}_LDFLAGS)"
 		fi
 		case $DISABLED in
-		*$mods*) doconfig=disabled;;
+		*$mods*)
+			# disabled by previous rule / Setup file
+			continue
+			;;
 		esac
 		case $doconfig in
 		yes)