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

This commit is contained in:
Christian Heimes 2021-12-10 15:11:55 +02:00 committed by GitHub
parent 74b23c97cd
commit 036bbb1d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions

View File

@ -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``.

View File

@ -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"