Skip to content
Snippets Groups Projects
Unverified Commit abdd69c9 authored by Christian Heimes's avatar Christian Heimes Committed by GitHub
Browse files

bpo-46023: makesetup: skip all duplicate modules (GH-32234)

parent 079143df
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Misc/NEWS.d/next/Build/2022-04-01-16-12-53.bpo-46023.1Z1OcC.rst 0 → 100644
+ 2
− 0
View file @ abdd69c9
``makesetup`` now detects and skips all duplicated module definitions. The
first entry wins.
Modules/makesetup
+ 12
− 6
View file @ abdd69c9
...@@ -117,6 +117,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | ...@@ -117,6 +117,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
BUILT= BUILT=
BUILT_SHARED= BUILT_SHARED=
DISABLED= DISABLED=
CONFIGURED=
MODS= MODS=
SHAREDMODS= SHAREDMODS=
OBJS= OBJS=
...@@ -206,12 +207,17 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | ...@@ -206,12 +207,17 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
cpps="\$(MODULE_${mods_upper}_CFLAGS)" cpps="\$(MODULE_${mods_upper}_CFLAGS)"
libs="\$(MODULE_${mods_upper}_LDFLAGS)" libs="\$(MODULE_${mods_upper}_LDFLAGS)"
fi fi
case $DISABLED in for mod in $mods
*$mods*) do
# disabled by previous rule / Setup file case $CONFIGURED in
continue *,${mod},*)
;; # Detected multiple rules for a module, first rule wins. This
# allows users to disable modules in Setup.local.
echo 1>&2 "maksetup: '$mod' was handled by previous rule."
continue 2;;
esac esac
CONFIGURED="$CONFIGURED,${mod},"
done
case $doconfig in case $doconfig in
yes) yes)
LIBS="$LIBS $libs" LIBS="$LIBS $libs"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment