bpo-46023: Fix makesetup handling of disabled rule (GH-30001)

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
new file mode 100644 (file)
index 0000000..4ef9202
--- /dev/null
+++ 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
index 2335724e804cc0db8faaa53301d31501c2e389ae..6d83b8f0cbb7a49b56852490f25b3f742a7e410c 100755 (executable)
--- 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"