libtool-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Libtool branch, master, updated. v2.2.10-187-g69e7767


From: Charles Wilson
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-187-g69e7767
Date: Fri, 17 Sep 2010 18:39:59 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  69e77671311ab54de44ba24ff5dbf5568bf1221d (commit)
      from  301c4cf24f5ddaa565ffb773906247deb1319aa2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 69e77671311ab54de44ba24ff5dbf5568bf1221d
Author: Charles Wilson <address@hidden>
Date:   Fri Sep 17 12:23:28 2010 -0400

    Fix order of PATH manipulation in cwrapper and shwrapper
    
    * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src:main): Call
    lt_update_exe_path before lt_update_lib_path, to ensure that the
    temporary rpath values (which include the OBJDIRs of uninstalled
    libtool libraries) precede installation and final -rpath directories.
    (func_emit_wrapper): Prepend $dllsearchpath to PATH before prepending
    $temp_rpath to $shlibpath_var; similar rationale as above.
    Reported by Jon Turney <address@hidden>
    
    Signed-off-by: Charles Wilson <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   11 +++++++++++
 libltdl/config/ltmain.m4sh |   26 +++++++++++++++++---------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 334a5d0..17e50cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2010-09-17  Charles Wilson  <address@hidden>
 
+       Fix order of PATH manipulation in cwrapper and shwrapper
+       * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src:main): Call
+       lt_update_exe_path before lt_update_lib_path, to ensure that the
+       temporary rpath values (which include the OBJDIRs of uninstalled
+       libtool libraries) precede installation and final -rpath directories.
+       (func_emit_wrapper): Prepend $dllsearchpath to PATH before prepending
+       $temp_rpath to $shlibpath_var; similar rationale as above.
+       Reported by Jon Turney <address@hidden>
+
+2010-09-17  Charles Wilson  <address@hidden>
+
        Document libtool variable to_host_file_cmd.
        * doc/libtool.texi (libtool script contents:to_host_file_cmd):
        Document variable.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 7bbca85..4f5bbb3 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -3293,6 +3293,18 @@ func_exec_program ()
 
   if test -f \"\$progdir/\$program\"; then"
 
+       # fixup the dll searchpath if we need to.
+       #
+       # Fix the DLL searchpath if we need to.  Do this before prepending
+       # to shlibpath, because on Windows, both are PATH and uninstalled
+       # libraries must come first.
+       if test -n "$dllsearchpath"; then
+         $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+       fi
+
        # Export our shlibpath_var if we have one.
        if test "$shlibpath_overrides_runpath" = yes && test -n 
"$shlibpath_var" && test -n "$temp_rpath"; then
          $ECHO "\
@@ -3307,14 +3319,6 @@ func_exec_program ()
 "
        fi
 
-       # fixup the dll searchpath if we need to.
-       if test -n "$dllsearchpath"; then
-         $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-       fi
-
        $ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
@@ -3703,8 +3707,12 @@ EOF
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 
   lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
                  nonnull (lt_argv_zero));


hooks/post-receive
-- 
GNU Libtool



reply via email to

[Prev in Thread] Current Thread [Next in Thread]