Re: [REBASED PATCH 0/9] Paolo's sysroot patches, rebased plus some fixes

[Paolo Bonzini]

On 07/28/2010 07:35 PM, Charles Wilson wrote:

$ diff good-041/inst/lib/liba.la bad-041/inst/lib/liba.la
20c20
< dependency_libs='
-R/usr/src/packages/libtool/git/build-bisect/tests/testsuite.dir/041/foobar'

---
 > dependency_libs=''

$ diff good-041/inst/lib/libb.la bad-041/inst/lib/libb.la
20c20
< dependency_libs='
-R/usr/src/packages/libtool/git/build-bisect/tests/testsuite.dir/041/foobar
/usr/src/packages/libtool/git/build-bisect/tests/testsuite.dir/041/inst/lib/liba.la'

---
 > dependency_libs='
/usr/src/packages/libtool/git/build-bisect/tests/testsuite.dir/041/inst/lib/liba.la
/usr/src/packages/libtool/git/build-bisect/tests/testsuite.dir/041/inst/lib/liba.la'

There you go.  Two problems here

+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ newdependency_libs="$newdependency_libs ${lt_sysroot:+=}$libdir/$name"

Double line. Actually not covered by new:41.

+ ;;
+      -L*)
+ func_stripname -L '' "$i"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdeplibs " -L$func_replace_sysroot_result"

s/newdeplibs/newdependency_libs/ -- this was in my patchset too

+ ;;
+      -R*)
+ func_stripname -R '' "$i"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdeplibs " -R$func_replace_sysroot_result"

s/newdeplibs/newdependency_libs/ -- also in my patchset.

This should fix it.  I'll send an updated patchset soon.

Paolo

From b1d19efd3ab4d66e16adcf99e3316cbafc9696f4 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonz...@gnu.org>
Date: Wed, 28 Jul 2010 23:36:46 +0200
Subject: [PATCH] fix ltmain.m4sh

---
 libltdl/config/ltmain.m4sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 206bda9..e135963 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7716,12 +7716,12 @@ EOF
              -L*)
                func_stripname -L '' "$i"
                func_replace_sysroot "$func_stripname_result"
-               newdeplibs="$newdeplibs -L$func_replace_sysroot_result"
+               newdependency_libs="$newdependency_libs 
-L$func_replace_sysroot_result"
                ;;
              -R*)
                func_stripname -R '' "$i"
                func_replace_sysroot "$func_stripname_result"
-               newdeplibs="$newdeplibs -R$func_replace_sysroot_result"
+               newdependency_libs="$newdependency_libs 
-R$func_replace_sysroot_result"
                ;;
              *) newdependency_libs="$newdependency_libs $deplib" ;;
              esac
-- 
1.7.1