mirror of
git://git.savannah.gnu.org/libtool.git
synced 2024-12-15 06:49:57 +08:00
maint: update Bootstrap git module
Fixes bug#47000. * bootstrap: Regenerated. * gl-mod/bootstrap: Updated to the latest HEAD.
This commit is contained in:
parent
0c1bc69dac
commit
fc7779d7d8
55
bootstrap
55
bootstrap
@ -9,7 +9,7 @@
|
||||
# This is free software. There is NO warranty; not even for
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Copyright (C) 2010-2019 Bootstrap Authors
|
||||
# Copyright (C) 2010-2019, 2021 Bootstrap Authors
|
||||
#
|
||||
# This file is dual licensed under the terms of the MIT license
|
||||
# <https://opensource.org/license/MIT>, and GPL version 3 or later
|
||||
@ -235,7 +235,7 @@ scriptversion=2019-02-19.15; # UTC
|
||||
# This is free software. There is NO warranty; not even for
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Copyright (C) 2004-2019 Bootstrap Authors
|
||||
# Copyright (C) 2004-2019, 2021 Bootstrap Authors
|
||||
#
|
||||
# This file is dual licensed under the terms of the MIT license
|
||||
# <https://opensource.org/license/MIT>, and GPL version 3 or later
|
||||
@ -293,6 +293,12 @@ do
|
||||
_G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
|
||||
fi"
|
||||
done
|
||||
# These NLS vars are set unconditionally (bootstrap issue #24). Unset those
|
||||
# in case the environment reset is needed later and the $save_* variant is not
|
||||
# defined (see the code above).
|
||||
LC_ALL=C
|
||||
LANGUAGE=C
|
||||
export LANGUAGE LC_ALL
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
sp=' '
|
||||
@ -531,6 +537,35 @@ sed_double_backslash="\
|
||||
s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
|
||||
s/\n//g"
|
||||
|
||||
# require_check_ifs_backslash
|
||||
# ---------------------------
|
||||
# Check if we can use backslash as IFS='\' separator, and set
|
||||
# $check_ifs_backshlash_broken to ':' or 'false'.
|
||||
require_check_ifs_backslash=func_require_check_ifs_backslash
|
||||
func_require_check_ifs_backslash ()
|
||||
{
|
||||
_G_save_IFS=$IFS
|
||||
IFS='\'
|
||||
_G_check_ifs_backshlash='a\\b'
|
||||
for _G_i in $_G_check_ifs_backshlash
|
||||
do
|
||||
case $_G_i in
|
||||
a)
|
||||
check_ifs_backshlash_broken=false
|
||||
;;
|
||||
'')
|
||||
break
|
||||
;;
|
||||
*)
|
||||
check_ifs_backshlash_broken=:
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
IFS=$_G_save_IFS
|
||||
require_check_ifs_backslash=:
|
||||
}
|
||||
|
||||
|
||||
## ----------------- ##
|
||||
## Global variables. ##
|
||||
@ -1271,6 +1306,8 @@ func_quote_portable ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
$require_check_ifs_backslash
|
||||
|
||||
func_quote_portable_result=$2
|
||||
|
||||
# one-time-loop (easy break)
|
||||
@ -1285,8 +1322,10 @@ func_quote_portable ()
|
||||
# Quote for eval.
|
||||
case $func_quote_portable_result in
|
||||
*[\\\`\"\$]*)
|
||||
case $func_quote_portable_result in
|
||||
*[\[\*\?]*)
|
||||
# Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
|
||||
# contains the shell wildcard characters.
|
||||
case $check_ifs_backshlash_broken$func_quote_portable_result in
|
||||
:*|*[\[\*\?]*)
|
||||
func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
|
||||
| $SED "$sed_quote_subst"`
|
||||
break
|
||||
@ -1660,7 +1699,7 @@ func_lt_ver ()
|
||||
# This is free software. There is NO warranty; not even for
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Copyright (C) 2010-2019 Bootstrap Authors
|
||||
# Copyright (C) 2010-2019, 2021 Bootstrap Authors
|
||||
#
|
||||
# This file is dual licensed under the terms of the MIT license
|
||||
# <https://opensource.org/license/MIT>, and GPL version 3 or later
|
||||
@ -2219,7 +2258,7 @@ else
|
||||
|
||||
func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
|
||||
func_split_equals_rhs=
|
||||
test "x$func_split_equals_lhs" = "x$1" \
|
||||
test "x$func_split_equals_lhs=" = "x$1" \
|
||||
|| func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
|
||||
}
|
||||
fi #func_split_equals
|
||||
@ -2245,7 +2284,7 @@ else
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
|
||||
func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'`
|
||||
func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
|
||||
}
|
||||
fi #func_split_short_opt
|
||||
@ -2345,7 +2384,7 @@ func_version ()
|
||||
# This is free software. There is NO warranty; not even for
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Copyright (C) 2010-2019 Bootstrap Authors
|
||||
# Copyright (C) 2010-2019, 2021 Bootstrap Authors
|
||||
#
|
||||
# This file is dual licensed under the terms of the MIT license
|
||||
# <https://opensource.org/license/MIT>, and GPL version 3 or later
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 037f83765b6e8f90dfabdfac4889be22a5a3f4a4
|
||||
Subproject commit 3d6394c3617a6a79e460ac513fa3281f8ae72cd0
|
Loading…
Reference in New Issue
Block a user