Skip to content

Commit 036bbb1

Browse files
authored
bpo-46023: Fix makesetup handling of disabled rule (GH-30001)
1 parent 74b23c9 commit 036bbb1

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed
Original file line numberDiff line numberDiff 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``.

Diff for: Modules/makesetup

+3
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
206206
cpps="\$(MODULE_${mods_upper}_CFLAGS)"
207207
libs="\$(MODULE_${mods_upper}_LDFLAGS)"
208208
fi
209+
case $DISABLED in
210+
*$mods*) doconfig=disabled;;
211+
esac
209212
case $doconfig in
210213
yes)
211214
LIBS="$LIBS $libs"

0 commit comments

Comments
 (0)