mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
configure: Use a different variable name in push/popvar
The variable name 'var' is commonly used to iterate through arguments in other functions. When the pushvar function internally uses the variable 'var', it makes pushing/popping the variable 'var' not work as intended. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
13f57a4d88
commit
4d810ad2e9
18
configure
vendored
18
configure
vendored
@ -424,21 +424,21 @@ get_safe(){
|
||||
}
|
||||
|
||||
pushvar(){
|
||||
for var in $*; do
|
||||
eval level=\${${var}_level:=0}
|
||||
eval ${var}_${level}="\$$var"
|
||||
eval ${var}_level=$(($level+1))
|
||||
for pvar in $*; do
|
||||
eval level=\${${pvar}_level:=0}
|
||||
eval ${pvar}_${level}="\$$pvar"
|
||||
eval ${pvar}_level=$(($level+1))
|
||||
done
|
||||
}
|
||||
|
||||
popvar(){
|
||||
for var in $*; do
|
||||
eval level=\${${var}_level:-0}
|
||||
for pvar in $*; do
|
||||
eval level=\${${pvar}_level:-0}
|
||||
test $level = 0 && continue
|
||||
eval level=$(($level-1))
|
||||
eval $var="\${${var}_${level}}"
|
||||
eval ${var}_level=$level
|
||||
eval unset ${var}_${level}
|
||||
eval $pvar="\${${pvar}_${level}}"
|
||||
eval ${pvar}_level=$level
|
||||
eval unset ${pvar}_${level}
|
||||
done
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user