Re: [PATCH 4/7] Use func_to_tool_file instead of fix_srcfile_path.

[Peter Rosin]

Den 2010-09-05 23:23 skrev Ralf Wildenhues:
> 2/7 and 3/7 are ok, thanks.

Aha, look what I found!

> * Peter Rosin wrote on Sun, Sep 05, 2010 at 10:01:04PM CEST:
>> 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.
> 
>> --- 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.
> 
> s/removed/replaced by a more shiny and better bla?
> (well, something to that end ...)
> 
> OK with that fixed.

Ok, I'm pushing 1 through 4. I'm pushing 4 as below.

Cheers,
Peter

>From d243a1ec536d9e154c6dfca271352fe991d854c2 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Mon, 6 Sep 2010 10:40:25 +0200
Subject: [PATCH 4/4] 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 replaced.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog                  |    8 ++++++++
 NEWS                       |    2 ++
 doc/libtool.texi           |    4 ----
 libltdl/config/ltmain.m4sh |    5 ++---
 libltdl/m4/libtool.m4      |    3 ---
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ecd953..f177fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-06  Peter Rosin  <address@hidden>
 
+       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 replaced.
+
        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..8cf68b9 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,8 @@ New in 2.2.12 2010-08-??: git version 2.2.11a, Libtool team:
   - Autoconf 2.62 and Automake 1.11.1 or newer are now required for
     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 replaced by a more thorough
+    mechanism triggered by the to_tool_file_cmd variable.
 
 * Changes in supported systems or compilers:
 
diff --git a/doc/libtool.texi b/doc/libtool.texi
index f5d2f97..5a76e26 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -6546,10 +6546,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