[Libguestfs] Strange libtool problem
Richard W.M. Jones
rjones at redhat.com
Thu May 12 10:17:23 UTC 2011
On Sat, Apr 09, 2011 at 05:11:34PM +0100, Richard W.M. Jones wrote:
> I'm not sure if this is related to me updating to gcc 4.6.0 or not,
> but in the gnulib/lib directory I get an error which comes down to the
> following libtool command running:
>
> $ ../../libtool --tag=CC --mode=compile gcc -std=gnu99 -std=gnu99 -DHAVE_CONFIG_H -I. -I../.. -g -O2 -MT c-ctype.lo -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.lo c-ctype.c
> ../../libtool: line 2075: c-ctype.c: command not found
> libtool: compile: gcc -std=gnu99 -std=gnu99 -DHAVE_CONFIG_H -I. -I../.. -g -O2 -MT c-ctype.lo -MD -MP -MF .deps/c-ctype.Tpo -c "" -fPIC -DPIC -o .libs/c-ctype.o
> gcc: error: : No such file or directory
> gcc: fatal error: no input files
> compilation terminated.
>
> Note how the -c option is converted to -c "". Also the error
> "c-ctype.c: command not found" which comes from a function very deep
> in libtool which is called from all over the place.
>
> I've tried recreating libtool, but to no effect.
I'm still getting this problem, now with hivex. It seems to be that
libtool is broken.
The diff between working libtool and broken libtool is attached.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
--- /home/rjones/d/hivex/libtool 2011-05-12 11:08:51.411640026 +0100
+++ libtool 2011-05-12 11:14:38.925755141 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (libguestfs) 1.11.5
+# Generated automatically by config.status (hivex) 1.2.6
# Libtool was configured on host spin.home.annexia.org:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -110,42 +110,19 @@
# turn newlines into spaces.
NL2SP="tr \\015\\012 \\040\\040"
-# convert $build file names to $host format.
-to_host_file_cmd=func_convert_file_noop
-
-# convert $build files to toolchain format.
-to_tool_file_cmd=func_convert_file_noop
-
# An object symbol dumper.
OBJDUMP="objdump"
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
file_magic_cmd="\$MAGIC_CMD"
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=""
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob="no"
-
-# DLL creation program.
-DLLTOOL="false"
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd="printf %s\\n"
-
# The archiver.
AR="ar"
-
-# Flags to create an archive.
AR_FLAGS="cru"
-# How to feed a file listing to the archiver.
-archiver_list_spec="@"
-
# A symbol stripping program.
STRIP="strip"
@@ -158,28 +135,22 @@
lock_old_archive_extraction=no
# A C compiler.
-LTCC="gcc -std=gnu99 -std=gnu99"
+LTCC="gcc -std=gnu99"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
-
-# Specify filename containing input files for $NM.
-nm_file_list_spec="@"
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=
+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
# The name of the directory that contains temporary libtool files.
objdir=.libs
@@ -190,9 +161,6 @@
# Must we lock files when doing compilation?
need_locks="no"
-# Manifest tool.
-MANIFEST_TOOL=":"
-
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=""
@@ -299,7 +267,7 @@
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
# A language specific compiler.
-CC="gcc -std=gnu99"
+CC="gcc"
# Is the compiler the GNU compiler?
with_gcc=yes
@@ -307,12 +275,12 @@
# Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin"
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-
# How to pass a linker flag through the compiler.
wl="-Wl,"
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC -DPIC"
+
# Compiler flag to prevent dynamic linking.
link_static_flag="-static"
@@ -341,11 +309,11 @@
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
- \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
# Commands used to build a loadable module if different from building
# a shared archive.
@@ -402,6 +370,9 @@
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=unknown
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -417,9 +388,6 @@
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=""
-# Commands necessary for finishing linking programs.
-postlink_cmds=""
-
# Specify filename containing input files.
file_list_spec=""
@@ -599,18 +567,20 @@
# otherwise set result to NONDIR_REPLACEMENT.
func_dirname ()
{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-} # Extended-shell func_dirname implementation
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+} # func_dirname may be replaced by extended shell implementation
# func_basename file
func_basename ()
{
- func_basename_result="${1##*/}"
-} # Extended-shell func_basename implementation
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
# func_dirname_and_basename file append nondir_replacement
@@ -627,12 +597,15 @@
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-} # Extended-shell func_dirname_and_basename implementation
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
# func_stripname prefix suffix name
@@ -643,12 +616,11 @@
# func_strip_suffix prefix name
func_stripname ()
{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-} # Extended-shell func_stripname implementation
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname may be replaced by extended shell implementation
# These SED scripts presuppose an absolute path with a trailing slash.
@@ -1228,9 +1200,12 @@
# variables after splitting SHORTOPT after the 2nd character.
func_split_short_opt ()
{
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-} # Extended-shell func_split_short_opt implementation
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
# func_split_long_opt longopt
@@ -1238,9 +1213,12 @@
# variables after splitting LONGOPT at the `=' sign.
func_split_long_opt ()
{
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}
-} # Extended-shell func_split_long_opt implementation
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
+
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
exit_cmd=:
@@ -1268,8 +1246,8 @@
# Append VALUE to the end of shell variable VAR.
func_append ()
{
- eval "${1}+=\${2}"
-} # Extended-shell func_append implementation
+ eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
# func_append_quoted var value
# Quote VALUE and append to the end of shell variable VAR, separated
@@ -1277,40 +1255,37 @@
func_append_quoted ()
{
func_quote_for_eval "${2}"
- eval "${1}+=\\ \$func_quote_for_eval_result"
-} # Extended-shell func_append_quoted implementation
+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
# func_arith arithmetic-term...
func_arith ()
{
- func_arith_result=$(( $* ))
-} # Extended-shell func_arith implementation
+ func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
# func_len string
# STRING may not start with a hyphen.
func_len ()
{
- func_len_result=${#1}
-} # Extended-shell func_len implementation
+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
# func_lo2o object
func_lo2o ()
{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-} # Extended-shell func_lo2o implementation
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=${1%.*}.lo
-} # Extended-shell func_xform implementation
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
# func_fatal_configuration arg...
@@ -1541,27 +1516,27 @@
;;
--no-silent|--no-quiet)
opt_silent=false
-preserve_args+=" $opt"
+func_append preserve_args " $opt"
;;
--no-verbose)
opt_verbose=false
-preserve_args+=" $opt"
+func_append preserve_args " $opt"
;;
--silent|--quiet)
opt_silent=:
-preserve_args+=" $opt"
+func_append preserve_args " $opt"
opt_verbose=false
;;
--verbose|-v)
opt_verbose=:
-preserve_args+=" $opt"
+func_append preserve_args " $opt"
opt_silent=false
;;
--tag)
test $# = 0 && func_missing_arg $opt && break
optarg="$1"
opt_tag="$optarg"
-preserve_args+=" $opt $optarg"
+func_append preserve_args " $opt $optarg"
func_enable_tag "$optarg"
shift
;;
@@ -1599,7 +1574,7 @@
fi
# preserve --debug
- test "$opt_debug" = : || preserve_args+=" --debug"
+ test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -2058,7 +2033,7 @@
;;
esac
case $4 in
- $2 ) func_to_host_path_result+="$3"
+ $2 ) func_append func_to_host_path_result "$3"
;;
esac
}
@@ -2408,12 +2383,12 @@
;;
-pie | -fpie | -fPIE)
- pie_flag+=" $arg"
+ func_append pie_flag " $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- later+=" $arg"
+ func_append later " $arg"
continue
;;
@@ -2441,7 +2416,7 @@
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- base_compile+=" $lastarg"
+ func_append base_compile " $lastarg"
continue
;;
@@ -2588,12 +2563,12 @@
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- removelist+=" $output_obj"
+ func_append removelist " $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- removelist+=" $lockfile"
+ func_append removelist " $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
@@ -2617,7 +2592,7 @@
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- command+=" -o $lobj"
+ func_append command " -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -2664,11 +2639,11 @@
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- command+=" -o $obj"
+ func_append command " -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- command+="$suppress_output"
+ func_append command "$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -2976,7 +2951,7 @@
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- dir+="/$objdir"
+ func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -3079,11 +3054,11 @@
for opt in "$nonopt" ${1+"$@"}
do
if test -d "$opt"; then
- libdirs+=" $opt"
+ func_append libdirs " $opt"
elif test -f "$opt"; then
if func_lalib_unsafe_p "$opt"; then
- libs+=" $opt"
+ func_append libs " $opt"
else
func_warning "\`$opt' is not a valid libtool archive"
fi
@@ -3127,7 +3102,7 @@
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || admincmds+="
+ $opt_dry_run || eval "$cmds" || func_append admincmds "
$cmds"
fi
done
@@ -3209,7 +3184,7 @@
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- install_prog+="$func_quote_for_eval_result"
+ func_append install_prog "$func_quote_for_eval_result"
install_shared_prog=$install_prog
case " $install_prog " in
*[\\\ /]cp\ *) install_cp=: ;;
@@ -3229,7 +3204,7 @@
do
arg2=
if test -n "$dest"; then
- files+=" $dest"
+ func_append files " $dest"
dest=$arg
continue
fi
@@ -3267,11 +3242,11 @@
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- install_prog+=" $func_quote_for_eval_result"
+ func_append install_prog " $func_quote_for_eval_result"
if test -n "$arg2"; then
func_quote_for_eval "$arg2"
fi
- install_shared_prog+=" $func_quote_for_eval_result"
+ func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -3283,7 +3258,7 @@
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
func_quote_for_eval "$install_override_mode"
- install_shared_prog+=" -m $func_quote_for_eval_result"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
fi
fi
@@ -3341,7 +3316,7 @@
case $file in
*.$libext)
# Do the static libraries later.
- staticlibs+=" $file"
+ func_append staticlibs " $file"
;;
*.la)
@@ -3361,19 +3336,19 @@
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) current_libdirs+=" $libdir" ;;
+ *) func_append current_libdirs " $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) future_libdirs+=" $libdir" ;;
+ *) func_append future_libdirs " $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- dir+="$objdir"
+ func_append dir "$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
@@ -3450,7 +3425,7 @@
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && staticlibs+=" $dir/$old_library"
+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
;;
*.lo)
@@ -3909,7 +3884,7 @@
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) symtab_cflags+=" $arg" ;;
+ *) func_append symtab_cflags " $arg" ;;
esac
done
@@ -5625,14 +5600,14 @@
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
- libtool_args+=" $func_quote_for_eval_result"
+ func_append libtool_args " $func_quote_for_eval_result"
# If the previous option needs an argument, assign it.
if test -n "$prev"; then
case $prev in
output)
- compile_command+=" @OUTPUT@"
- finalize_command+=" @OUTPUT@"
+ func_append compile_command " @OUTPUT@"
+ func_append finalize_command " @OUTPUT@"
;;
esac
@@ -5645,8 +5620,8 @@
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
- compile_command+=" @SYMFILE@"
- finalize_command+=" @SYMFILE@"
+ func_append compile_command " @SYMFILE@"
+ func_append finalize_command " @SYMFILE@"
preload=yes
fi
case $arg in
@@ -5673,9 +5648,9 @@
;;
*)
if test "$prev" = dlfiles; then
- dlfiles+=" $arg"
+ func_append dlfiles " $arg"
else
- dlprefiles+=" $arg"
+ func_append dlprefiles " $arg"
fi
prev=
continue
@@ -5699,7 +5674,7 @@
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) deplibs+=" $qarg.ltframework" # this is fixed later
+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -5718,7 +5693,7 @@
moreargs=
for fil in `cat "$save_arg"`
do
-# moreargs+=" $fil"
+# func_append moreargs " $fil"
arg=$fil
# A libtool-controlled object.
@@ -5747,7 +5722,7 @@
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles+=" $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -5759,12 +5734,12 @@
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles+=" $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
# A PIC object.
- libobjs+=" $pic_object"
+ func_append libobjs " $pic_object"
arg="$pic_object"
fi
@@ -5774,7 +5749,7 @@
non_pic_object="$xdir$non_pic_object"
# A standard non-PIC object
- non_pic_objects+=" $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5782,7 +5757,7 @@
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
non_pic_object="$pic_object"
- non_pic_objects+=" $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -5794,8 +5769,8 @@
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
non_pic_object=$xdir$func_lo2o_result
- libobjs+=" $pic_object"
- non_pic_objects+=" $non_pic_object"
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
else
func_fatal_error "\`$arg' is not a valid libtool object"
fi
@@ -5829,12 +5804,12 @@
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) rpath+=" $arg" ;;
+ *) func_append rpath " $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) xrpath+=" $arg" ;;
+ *) func_append xrpath " $arg" ;;
esac
fi
prev=
@@ -5846,31 +5821,31 @@
continue
;;
weak)
- weak_libs+=" $arg"
+ func_append weak_libs " $arg"
prev=
continue
;;
xcclinker)
- linker_flags+=" $qarg"
- compiler_flags+=" $qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $qarg"
prev=
- compile_command+=" $qarg"
- finalize_command+=" $qarg"
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
continue
;;
xcompiler)
- compiler_flags+=" $qarg"
+ func_append compiler_flags " $qarg"
prev=
- compile_command+=" $qarg"
- finalize_command+=" $qarg"
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
continue
;;
xlinker)
- linker_flags+=" $qarg"
- compiler_flags+=" $wl$qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $wl$qarg"
prev=
- compile_command+=" $wl$qarg"
- finalize_command+=" $wl$qarg"
+ func_append compile_command " $wl$qarg"
+ func_append finalize_command " $wl$qarg"
continue
;;
*)
@@ -5887,8 +5862,8 @@
-all-static)
if test -n "$link_static_flag"; then
# See comment for -static flag below, for more details.
- compile_command+=" $link_static_flag"
- finalize_command+=" $link_static_flag"
+ func_append compile_command " $link_static_flag"
+ func_append finalize_command " $link_static_flag"
fi
continue
;;
@@ -5950,8 +5925,8 @@
-L[A-Z][A-Z]*:*)
case $with_gcc/$host in
no/*-*-irix* | /*-*-irix*)
- compile_command+=" $arg"
- finalize_command+=" $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
;;
esac
continue
@@ -5985,10 +5960,10 @@
*)
# Preserve sysroot, but never include relative directories
case $dir in
- [\\/]* | [A-Za-z]:[\\/]* | =*) deplibs+=" $arg" ;;
- *) deplibs+=" -L$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+ *) func_append deplibs " -L$dir" ;;
esac
- lib_search_path+=" $dir"
+ func_append lib_search_path " $dir"
;;
esac
case $host in
@@ -5997,12 +5972,12 @@
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) dllsearchpath+=":$dir";;
+ *) func_append dllsearchpath ":$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath+=":$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -6026,7 +6001,7 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs+=" System.ltframework"
+ func_append deplibs " System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -6046,7 +6021,7 @@
;;
esac
fi
- deplibs+=" $arg"
+ func_append deplibs " $arg"
continue
;;
@@ -6059,20 +6034,20 @@
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
-model|-arch|-isysroot|--sysroot)
- compiler_flags+=" $arg"
- compile_command+=" $arg"
- finalize_command+=" $arg"
+ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
prev=xcompiler
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags+=" $arg"
- compile_command+=" $arg"
- finalize_command+=" $arg"
+ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) new_inherited_linker_flags+=" $arg" ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
esac
continue
;;
@@ -6149,7 +6124,7 @@
esac
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath+=" $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
continue
;;
@@ -6202,8 +6177,8 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg+=" $func_quote_for_eval_result"
- compiler_flags+=" $func_quote_for_eval_result"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -6218,9 +6193,9 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg+=" $wl$func_quote_for_eval_result"
- compiler_flags+=" $wl$func_quote_for_eval_result"
- linker_flags+=" $func_quote_for_eval_result"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -6266,9 +6241,9 @@
-O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
- compile_command+=" $arg"
- finalize_command+=" $arg"
- compiler_flags+=" $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ func_append compiler_flags " $arg"
continue
;;
@@ -6280,7 +6255,7 @@
*.$objext)
# A standard object.
- objs+=" $arg"
+ func_append objs " $arg"
;;
*.lo)
@@ -6311,7 +6286,7 @@
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles+=" $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -6323,12 +6298,12 @@
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles+=" $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
# A PIC object.
- libobjs+=" $pic_object"
+ func_append libobjs " $pic_object"
arg="$pic_object"
fi
@@ -6338,7 +6313,7 @@
non_pic_object="$xdir$non_pic_object"
# A standard non-PIC object
- non_pic_objects+=" $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -6346,7 +6321,7 @@
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
non_pic_object="$pic_object"
- non_pic_objects+=" $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -6358,8 +6333,8 @@
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
non_pic_object=$xdir$func_lo2o_result
- libobjs+=" $pic_object"
- non_pic_objects+=" $non_pic_object"
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
else
func_fatal_error "\`$arg' is not a valid libtool object"
fi
@@ -6368,8 +6343,8 @@
*.$libext)
# An archive.
- deplibs+=" $arg"
- old_deplibs+=" $arg"
+ func_append deplibs " $arg"
+ func_append old_deplibs " $arg"
continue
;;
@@ -6379,14 +6354,14 @@
func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- dlfiles+=" $func_resolve_sysroot_result"
+ func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- dlprefiles+=" $func_resolve_sysroot_result"
+ func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
- deplibs+=" $func_resolve_sysroot_result"
+ func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
@@ -6402,8 +6377,8 @@
# Now actually substitute the argument into the commands.
if test -n "$arg"; then
- compile_command+=" $arg"
- finalize_command+=" $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
fi
done # argument parsing loop
@@ -6412,8 +6387,8 @@
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
- compile_command+=" $arg"
- finalize_command+=" $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
fi
oldlibs=
@@ -6457,10 +6432,10 @@
for deplib in $deplibs; do
if $opt_preserve_dup_deps ; then
case "$libs " in
- *" $deplib "*) specialdeplibs+=" $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- libs+=" $deplib"
+ func_append libs " $deplib"
done
if test "$linkmode" = lib; then
@@ -6473,9 +6448,9 @@
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs+=" $pre_post_deps" ;;
+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
esac
- pre_post_deps+=" $pre_post_dep"
+ func_append pre_post_deps " $pre_post_dep"
done
fi
pre_post_deps=
@@ -6554,7 +6529,7 @@
deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) deplibs+=" $deplib" ;;
+ *) func_append deplibs " $deplib" ;;
esac
done
done
@@ -6575,11 +6550,11 @@
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- compiler_flags+=" $deplib"
+ func_append compiler_flags " $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags+=" $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -6664,7 +6639,7 @@
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags+=" $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -6678,7 +6653,7 @@
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
- newlib_search_path+=" $func_resolve_sysroot_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
if test "$pass" = conv; then
@@ -6693,7 +6668,7 @@
fi
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
- newlib_search_path+=" $func_resolve_sysroot_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -6709,7 +6684,7 @@
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath+=" $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
@@ -6781,11 +6756,11 @@
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- newdlprefiles+=" $deplib"
+ func_append newdlprefiles " $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- newdlfiles+=" $deplib"
+ func_append newdlfiles " $deplib"
fi
fi
continue
@@ -6831,7 +6806,7 @@
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) new_inherited_linker_flags+=" $tmp_inherited_linker_flag";;
+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
esac
done
fi
@@ -6839,8 +6814,8 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && dlfiles+=" $dlopen"
- test -n "$dlpreopen" && dlprefiles+=" $dlpreopen"
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
if test "$pass" = conv; then
@@ -6851,8 +6826,8 @@
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- convenience+=" $ladir/$objdir/$old_library"
- old_convenience+=" $ladir/$objdir/$old_library"
+ func_append convenience " $ladir/$objdir/$old_library"
+ func_append old_convenience " $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
@@ -6861,10 +6836,10 @@
deplibs="$deplib $deplibs"
if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs+=" $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs+=" $deplib"
+ func_append tmp_libs " $deplib"
done
continue
fi # $pass = conv
@@ -6897,9 +6872,9 @@
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- dlprefiles+=" $lib $dependency_libs"
+ func_append dlprefiles " $lib $dependency_libs"
else
- newdlfiles+=" $lib"
+ func_append newdlfiles " $lib"
fi
continue
fi # $pass = dlopen
@@ -6936,12 +6911,12 @@
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- notinst_path+=" $abs_ladir"
+ func_append notinst_path " $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- notinst_path+=" $abs_ladir"
+ func_append notinst_path " $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -6966,29 +6941,29 @@
if test -n "$dlname"; then
func_tr_sh "$dir/$linklib"
eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- newdlprefiles+=" $dir/$linklib"
+ func_append newdlprefiles " $dir/$linklib"
else
- newdlprefiles+=" $dir/$old_library"
+ func_append newdlprefiles " $dir/$old_library"
# Keep a list of preopened convenience libraries to check
# that they are being used correctly in the link pass.
test -z "$libdir" && \
- dlpreconveniencelibs+=" $dir/$old_library"
+ func_append dlpreconveniencelibs " $dir/$old_library"
fi
;;
* )
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
if test -n "$old_library"; then
- newdlprefiles+=" $dir/$old_library"
+ func_append newdlprefiles " $dir/$old_library"
# Keep a list of preopened convenience libraries to check
# that they are being used correctly in the link pass.
test -z "$libdir" && \
- dlpreconveniencelibs+=" $dir/$old_library"
+ func_append dlpreconveniencelibs " $dir/$old_library"
# Otherwise, use the dlname, so that lt_dlopen finds it.
elif test -n "$dlname"; then
- newdlprefiles+=" $dir/$dlname"
+ func_append newdlprefiles " $dir/$dlname"
else
- newdlprefiles+=" $dir/$linklib"
+ func_append newdlprefiles " $dir/$linklib"
fi
;;
esac
@@ -7009,7 +6984,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path+=" $ladir"
+ func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -7023,7 +6998,7 @@
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
- newlib_search_path+=" $func_resolve_sysroot_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
esac
# Need to link against all dependency_libs?
@@ -7036,10 +7011,10 @@
fi
if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs+=" $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs+=" $deplib"
+ func_append tmp_libs " $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -7054,7 +7029,7 @@
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) temp_rpath+="$absdir:" ;;
+ *) func_append temp_rpath "$absdir:" ;;
esac
fi
@@ -7066,7 +7041,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath+=" $absdir" ;;
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -7075,7 +7050,7 @@
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath+=" $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -7100,12 +7075,12 @@
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- notinst_deplibs+=" $lib"
+ func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- notinst_deplibs+=" $lib"
+ func_append notinst_deplibs " $lib"
need_relink=yes
fi
;;
@@ -7140,7 +7115,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath+=" $absdir" ;;
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -7149,7 +7124,7 @@
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath+=" $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -7259,7 +7234,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir+=" -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -7281,7 +7256,7 @@
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) compile_shlibpath+="$add_shlibpath:" ;;
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -7295,7 +7270,7 @@
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath+="$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
fi
fi
@@ -7315,7 +7290,7 @@
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath+="$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -7332,7 +7307,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir+=" -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -7409,15 +7384,15 @@
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) xrpath+=" $temp_xrpath";;
+ *) func_append xrpath " $temp_xrpath";;
esac;;
- *) temp_deplibs+=" $libdir";;
+ *) func_append temp_deplibs " $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- newlib_search_path+=" $absdir"
+ func_append newlib_search_path " $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
@@ -7432,10 +7407,10 @@
if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
- specialdeplibs+=" $func_resolve_sysroot_result" ;;
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
esac
fi
- tmp_libs+=" $func_resolve_sysroot_result"
+ func_append tmp_libs " $func_resolve_sysroot_result"
done
if test "$link_all_deplibs" != no; then
@@ -7475,8 +7450,8 @@
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- compiler_flags+=" ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- linker_flags+=" -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
@@ -7526,7 +7501,7 @@
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) lib_search_path+=" $dir" ;;
+ *) func_append lib_search_path " $dir" ;;
esac
done
newlib_search_path=
@@ -7584,10 +7559,10 @@
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) tmp_libs+=" $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
;;
- *) tmp_libs+=" $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -7603,7 +7578,7 @@
;;
esac
if test -n "$i" ; then
- tmp_libs+=" $i"
+ func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
@@ -7644,7 +7619,7 @@
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- objs+="$old_deplibs"
+ func_append objs "$old_deplibs"
;;
lib)
@@ -7680,7 +7655,7 @@
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- libobjs+=" $objs"
+ func_append libobjs " $objs"
fi
fi
@@ -7878,7 +7853,7 @@
done
# Make executables depend on our current version.
- verstring+=":${current}.0"
+ func_append verstring ":${current}.0"
;;
qnx)
@@ -7946,7 +7921,7 @@
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- libobjs+=" $symfileobj"
+ func_append libobjs " $symfileobj"
test "X$libobjs" = "X " && libobjs=
if test "$opt_mode" != relink; then
@@ -7965,7 +7940,7 @@
continue
fi
fi
- removelist+=" $p"
+ func_append removelist " $p"
;;
*) ;;
esac
@@ -7976,7 +7951,7 @@
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- oldlibs+=" $output_objdir/$libname.$libext"
+ func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
@@ -7994,10 +7969,10 @@
temp_xrpath=
for libdir in $xrpath; do
func_replace_sysroot "$libdir"
- temp_xrpath+=" -R$func_replace_sysroot_result"
+ func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath+=" $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -8011,7 +7986,7 @@
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) dlfiles+=" $lib" ;;
+ *) func_append dlfiles " $lib" ;;
esac
done
@@ -8021,7 +7996,7 @@
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) dlprefiles+=" $lib" ;;
+ *) func_append dlprefiles " $lib" ;;
esac
done
@@ -8033,7 +8008,7 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs+=" System.ltframework"
+ func_append deplibs " System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -8050,7 +8025,7 @@
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- deplibs+=" -lc"
+ func_append deplibs " -lc"
fi
;;
esac
@@ -8099,7 +8074,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -8110,7 +8085,7 @@
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
echo
@@ -8124,7 +8099,7 @@
fi
;;
*)
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -8142,7 +8117,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -8153,7 +8128,7 @@
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
echo
@@ -8175,7 +8150,7 @@
fi
;;
*)
- newdeplibs+=" $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -8192,7 +8167,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
@@ -8235,7 +8210,7 @@
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -8260,7 +8235,7 @@
;;
*)
# Add a -L argument.
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -8276,7 +8251,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
@@ -8289,7 +8264,7 @@
potlib="$potent_lib" # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -8314,7 +8289,7 @@
;;
*)
# Add a -L argument.
- newdeplibs+=" $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -8418,7 +8393,7 @@
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- new_libs+=" -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -8428,10 +8403,10 @@
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs+=" $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs+=" $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -8462,13 +8437,13 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs+="$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- dep_rpath+=" $flag"
+ func_append dep_rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
@@ -8491,7 +8466,7 @@
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath+="$dir:"
+ func_append rpath "$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -8525,7 +8500,7 @@
linknames=
for link
do
- linknames+=" $link"
+ func_append linknames " $link"
done
# Use standard objects if they are pic
@@ -8536,7 +8511,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- delfiles+=" $export_symbols"
+ func_append delfiles " $export_symbols"
fi
orig_export_symbols=
@@ -8596,7 +8571,7 @@
output=${output_objdir}/${output_la}.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
- delfiles+=" $output"
+ func_append delfiles " $output"
func_verbose "creating $NM input file list: $output"
for obj in $save_libobjs; do
func_to_tool_file "$obj"
@@ -8639,7 +8614,7 @@
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles+=" $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8649,7 +8624,7 @@
case " $convenience " in
*" $test_deplib "*) ;;
*)
- tmp_deplibs+=" $test_deplib"
+ func_append tmp_deplibs " $test_deplib"
;;
esac
done
@@ -8669,17 +8644,17 @@
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
- libobjs+=" $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- linker_flags+=" $flag"
+ func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
@@ -8749,7 +8724,7 @@
$ECHO "$func_to_tool_file_result" >> $output
done
echo ')' >> $output
- delfiles+=" $output"
+ func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
@@ -8768,7 +8743,7 @@
func_to_tool_file "$obj"
$ECHO "$func_to_tool_file_result" >> $output
done
- delfiles+=" $output"
+ func_append delfiles " $output"
func_to_tool_file "$output"
output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
else
@@ -8788,7 +8763,7 @@
len=$func_arith_result
if test "X$objlist" = X ||
test "$len" -lt "$max_cmd_len"; then
- objlist+=" $obj"
+ func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
@@ -8821,7 +8796,7 @@
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- delfiles+=" $output"
+ func_append delfiles " $output"
else
output=
@@ -8888,7 +8863,7 @@
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles+=" $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8929,10 +8904,10 @@
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- libobjs+=" $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -9044,7 +9019,7 @@
reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
@@ -9127,8 +9102,8 @@
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- compile_command+=" ${wl}-bind_at_load"
- finalize_command+=" ${wl}-bind_at_load"
+ func_append compile_command " ${wl}-bind_at_load"
+ func_append finalize_command " ${wl}-bind_at_load"
;;
esac
fi
@@ -9148,7 +9123,7 @@
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- new_libs+=" -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -9158,17 +9133,17 @@
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs+=" $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs+=" $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- compile_command+=" $compile_deplibs"
- finalize_command+=" $finalize_deplibs"
+ func_append compile_command " $compile_deplibs"
+ func_append finalize_command " $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -9176,7 +9151,7 @@
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath+=" $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
fi
@@ -9195,18 +9170,18 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs+="$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath+=" $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath+=" $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
case $host in
@@ -9215,12 +9190,12 @@
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) dllsearchpath+=":$libdir";;
+ *) func_append dllsearchpath ":$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath+=":$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -9246,18 +9221,18 @@
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs+="$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath+=" $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) finalize_perm_rpath+=" $libdir" ;;
+ *) func_append finalize_perm_rpath " $libdir" ;;
esac
fi
done
@@ -9336,7 +9311,7 @@
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath+="$dir:"
+ func_append rpath "$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -9344,7 +9319,7 @@
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- rpath+="$dir:"
+ func_append rpath "$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -9502,7 +9477,7 @@
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- oldobjs+=" $symfileobj"
+ func_append oldobjs " $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -9510,10 +9485,10 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $addlibs
- oldobjs+=" $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -9524,10 +9499,10 @@
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- oldobjs+=" $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -9545,7 +9520,7 @@
else
echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- generated+=" $gentop"
+ func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -9569,9 +9544,9 @@
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- oldobjs+=" $gentop/$newobj"
+ func_append oldobjs " $gentop/$newobj"
;;
- *) oldobjs+=" $obj" ;;
+ *) func_append oldobjs " $obj" ;;
esac
done
fi
@@ -9614,7 +9589,7 @@
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- objlist+=" $obj"
+ func_append objlist " $obj"
if test "$len" -lt "$max_cmd_len"; then
:
else
@@ -9687,19 +9662,19 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs+=" ${lt_sysroot:+=}$libdir/$name"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
func_stripname -L '' "$deplib"
func_replace_sysroot "$func_stripname_result"
- newdependency_libs+=" -L$func_replace_sysroot_result"
+ func_append newdependency_libs " -L$func_replace_sysroot_result"
;;
-R*)
func_stripname -R '' "$deplib"
func_replace_sysroot "$func_stripname_result"
- newdependency_libs+=" -R$func_replace_sysroot_result"
+ func_append newdependency_libs " -R$func_replace_sysroot_result"
;;
- *) newdependency_libs+=" $deplib" ;;
+ *) func_append newdependency_libs " $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -9713,9 +9688,9 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlfiles+=" ${lt_sysroot:+=}$libdir/$name"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
- *) newdlfiles+=" $lib" ;;
+ *) func_append newdlfiles " $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -9732,7 +9707,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlprefiles+=" ${lt_sysroot:+=}$libdir/$name"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
@@ -9744,7 +9719,7 @@
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlfiles+=" $abs"
+ func_append newdlfiles " $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -9753,7 +9728,7 @@
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlprefiles+=" $abs"
+ func_append newdlprefiles " $abs"
done
dlprefiles="$newdlprefiles"
fi
@@ -9858,9 +9833,9 @@
for arg
do
case $arg in
- -f) RM+=" $arg"; rmforce=yes ;;
- -*) RM+=" $arg" ;;
- *) files+=" $arg" ;;
+ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
esac
done
@@ -9885,7 +9860,7 @@
if test "$opt_mode" = clean; then
case " $rmdirs " in
*" $odir "*) ;;
- *) rmdirs+=" $odir" ;;
+ *) func_append rmdirs " $odir" ;;
esac
fi
@@ -9911,17 +9886,17 @@
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- rmfiles+=" $odir/$n"
+ func_append rmfiles " $odir/$n"
done
- test -n "$old_library" && rmfiles+=" $odir/$old_library"
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
case "$opt_mode" in
clean)
case " $library_names " in
*" $dlname "*) ;;
- *) test -n "$dlname" && rmfiles+=" $odir/$dlname" ;;
+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
esac
- test -n "$libdir" && rmfiles+=" $odir/$name $odir/${name}i"
+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -9949,13 +9924,13 @@
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- rmfiles+=" $dir/$pic_object"
+ func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- rmfiles+=" $dir/$non_pic_object"
+ func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
@@ -9971,7 +9946,7 @@
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- rmfiles+=" $file"
+ func_append rmfiles " $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -9980,7 +9955,7 @@
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- rmfiles+=" $func_ltwrapper_scriptname_result"
+ func_append rmfiles " $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -9988,12 +9963,12 @@
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- rmfiles+=" $odir/$name $odir/${name}S.${objext}"
+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- rmfiles+=" $odir/lt-$name"
+ func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- rmfiles+=" $odir/lt-${noexename}.c"
+ func_append rmfiles " $odir/lt-${noexename}.c"
fi
fi
fi
@@ -10057,3 +10032,98 @@
# End:
# vi:sw=2
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1+=\$2"
+}
More information about the Libguestfs
mailing list