>From 71450201b593f096efcc9ee9debfa64a71e25859 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Sun, 5 Sep 2010 18:00:16 +0200 Subject: [PATCH 4/7] Use func_to_tool_file instead of fix_srcfile_path. * libltdl/config/ltmain.m4sh (func_mode_compile): Replace the fix_srcfile_path hook with a call to func_to_tool_file. * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [cygwin,mingw,pw32] [cegcc]: Drop fix_srcfile_path. * doc/libtool.texi (libtool script contents): Likewise. * NEWS: Mention that fix_srcfile_path has been removed. Signed-off-by: Peter Rosin --- ChangeLog | 10 ++++++++++ NEWS | 2 ++ doc/libtool.texi | 4 ---- libltdl/config/ltmain.m4sh | 5 ++--- libltdl/m4/libtool.m4 | 3 --- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f894b87..0fcdc89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-09-05 Peter Rosin + Use func_to_tool_file instead of fix_srcfile_path. + * libltdl/config/ltmain.m4sh (func_mode_compile): Replace the + fix_srcfile_path hook with a call to func_to_tool_file. + * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [cygwin,mingw,pw32] + [cegcc]: Drop fix_srcfile_path. + * doc/libtool.texi (libtool script contents): Likewise. + * NEWS: Mention that fix_srcfile_path has been removed. + +2010-09-05 Peter Rosin + Convert file names to toolchain format in $NM and $AR @files. * libltdl/config/ltmain.m4sh (func_mode_link): When listing symbols and when creating archives using command files (or diff --git a/NEWS b/NEWS index 688bdca..89b8f41 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,8 @@ New in 2.2.12 2010-08-??: git version 2.2.11a, Libtool team: bootstrapping Libtool. For using Libtool in your own projects, Autoconf 2.59 and Automake 1.9.6 should still work. + - The fix_srcfile_path variable has been removed. + * Changes in supported systems or compilers: - Initial support for the Microsoft C/C++ Compiler, with help from diff --git a/doc/libtool.texi b/doc/libtool.texi index 0633a57..6e52b51 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -6532,10 +6532,6 @@ specific directory. Same as @code{finish_cmds}, except the commands are not displayed. @end defvar address@hidden fix_srcfile_path -Expression to fix the shell variable @samp{$srcfile} for the compiler. address@hidden defvar - @defvar global_symbol_pipe A pipeline that takes the output of @code{NM}, and produces a listing of raw symbols followed by their C names. For example: diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index cecc7f4..e5867b6 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -1376,9 +1376,8 @@ compiler." func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index fa46813..132dd2c 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -5036,7 +5036,6 @@ _LT_EOF _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; esac @@ -5571,8 +5570,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], -- 1.7.1