bpo-46023: Fix makesetup handling of disabled rule

tiran · tiran · commit f0be9535b933 · 2021-12-09T15:25:56.000+01:00
Signed-off-by: Christian Heimes &lt;christian@python.org&gt;
diff --git a/Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst b/Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst
@@ -0,0 +1,2 @@
+:program:`makesetup` no longer builds extensions that have been marked as
+*disabled*. This allows users to disable modules in ``Modules/Setup.local``.
diff --git a/Modules/makesetup b/Modules/makesetup
@@ -206,6 +206,9 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			cpps="\$(MODULE_${mods_upper}_CFLAGS)"
 			libs="\$(MODULE_${mods_upper}_LDFLAGS)"
 		fi
+		case $DISABLED in
+		*$mods*) doconfig=disabled;;
+		esac
 		case $doconfig in
 		yes)
 			LIBS="$LIBS $libs"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:program:`makesetup` no longer builds extensions that have been marked as
	`2`	+disabled. This allows users to disable modules in ``Modules/Setup.local``.