From: Ralf Wildenhues Date: Mon, 14 Jan 2008 22:06:00 +0000 (+0000) Subject: Silence all non-warning output from `libtool --silent'. X-Git-Tag: release-2-1b~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5436459a6b7a7fe3059cabfb268331dbe298d402;p=thirdparty%2Flibtool.git Silence all non-warning output from `libtool --silent'. * libltdl/config/ltmain.m4sh (func_generate_dlsyms) (func_extract_archives, func_mode_link): Use func_verbose instead of func_echo for all non-warning output. --- diff --git a/ChangeLog b/ChangeLog index 37ea6a722..35b2940b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-01-14 Ralf Wildenhues + Silence all non-warning output from `libtool --silent'. + * libltdl/config/ltmain.m4sh (func_generate_dlsyms) + (func_extract_archives, func_mode_link): Use func_verbose + instead of func_echo for all non-warning output. + * Makefile.maint (fetch): Update to match upstream git sources. Pull `INSTALL' from gnulib instead of from Autoconf. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 9b208eefe..649f1b350 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -879,7 +879,7 @@ func_generate_dlsyms () func_show_eval "$RM $nlist ${nlist}S ${nlist}T" # Parse the name list into a source file. - func_echo "creating $output_objdir/$my_dlsyms" + func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ /* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ @@ -893,14 +893,14 @@ extern \"C\" { " if test "$dlself" = yes; then - func_echo "generating symbol list for \`$output'" + func_verbose "generating symbol list for \`$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_echo "extracting global C symbols from \`$progfile'" + func_verbose "extracting global C symbols from \`$progfile'" $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" done @@ -947,7 +947,7 @@ extern \"C\" { fi for dlprefile in $dlprefiles; do - func_echo "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" $opt_dry_run || { @@ -1159,7 +1159,7 @@ func_extract_archives () case $host in *-darwin*) - func_echo "Extracting $my_xabs" + func_verbose "Extracting $my_xabs" # Do not bother doing anything if just a dry run $opt_dry_run || { darwin_orig_dir=`pwd` @@ -1171,7 +1171,7 @@ func_extract_archives () if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= - func_echo "$darwin_base_archive has multiple architectures $darwin_arches" + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" for darwin_arch in $darwin_arches ; do func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" @@ -4655,13 +4655,13 @@ func_mode_link () # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_echo "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from \`$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_echo "generating import library for \`$soname'" + func_verbose "generating import library for \`$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -5982,7 +5982,7 @@ EOF # Prepare the list of exported symbols if test -z "$export_symbols"; then if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_echo "generating symbol list for \`$libname.la'" + func_verbose "generating symbol list for \`$libname.la'" export_symbols="$output_objdir/$libname.exp" $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds @@ -5996,7 +5996,7 @@ EOF skipped_export=false else # The command line is too long to execute in one step. - func_echo "using reloadable object file for export list..." + func_verbose "using reloadable object file for export list..." skipped_export=: # Break out early, otherwise skipped_export may be # set to false by a later but shorter cmd. @@ -6019,7 +6019,7 @@ EOF if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_echo "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of # 's' commands which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of @@ -6126,7 +6126,7 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript - func_echo "creating GNU ld script: $output" + func_verbose "creating GNU ld script: $output" $ECHO 'INPUT (' > $output for obj in $save_libobjs do @@ -6136,7 +6136,7 @@ EOF delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk - func_echo "creating linker input file list: $output" + func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift @@ -6153,7 +6153,7 @@ EOF output=$firstobj\"$file_list_spec$output\" else if test -n "$save_libobjs"; then - func_echo "creating reloadable object files..." + func_verbose "creating reloadable object files..." output=$output_objdir/$output_la-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs @@ -6196,7 +6196,7 @@ EOF fi if ${skipped_export-false}; then - func_echo "generating symbol list for \`$libname.la'" + func_verbose "generating symbol list for \`$libname.la'" export_symbols="$output_objdir/$libname.exp" $opt_dry_run || $RM $export_symbols libobjs=$output @@ -6209,7 +6209,7 @@ EOF fi test -n "$save_libobjs" && - func_echo "creating a temporary reloadable object file: $output" + func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. save_ifs="$IFS"; IFS='~' @@ -6249,7 +6249,7 @@ EOF if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_echo "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of # 's' commands which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of @@ -6746,7 +6746,7 @@ EOF func_show_eval "$link_command" 'exit $?' # Now create the wrapper script. - func_echo "creating $output" + func_verbose "creating $output" # Quote the relink command for shipping. if test -n "$relink_command"; then @@ -6928,7 +6928,7 @@ EOF cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts - func_echo "using piecewise archive linking..." + func_verbose "using piecewise archive linking..." save_RANLIB=$RANLIB RANLIB=: objlist= @@ -6978,7 +6978,7 @@ EOF *.la) old_library= test "$build_old_libs" = yes && old_library="$libname.$libext" - func_echo "creating $output" + func_verbose "creating $output" # Preserve any variables that may affect compiler behavior for var in $variables_saved_for_relink; do