From: Paolo Bonzini Date: Sat, 9 Oct 2010 08:37:41 +0000 (+0200) Subject: Add missing sysroot resolution. X-Git-Tag: v2.4.2~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ed5700993f997817ad5c164a4bbe4559e5bf66a;p=thirdparty%2Flibtool.git Add missing sysroot resolution. * libltdl/config/ltmain.m4sh (func_mode_link): Resolve sysroot when fetching the install directory of dependent libraries. Reported by Lionel Landwerlin , patch by Khem Raj . * THANKS: Reorder entries, add Khem and Lionel. --- diff --git a/ChangeLog b/ChangeLog index 9caba84cb..bfcbc8968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-10-09 Paolo Bonzini + + Add missing sysroot resolution. + * libltdl/config/ltmain.m4sh (func_mode_link): Resolve sysroot + when fetching the install directory of dependent libraries. + Reported by Lionel Landwerlin , + patch by Khem Raj . + * THANKS: Reorder entries, add Khem and Lionel. + 2010-10-07 Roumen Petrov Add test case for 69e77671 (cwrapper PATH manipulation order) diff --git a/THANKS b/THANKS index ff3ab7d3f..5aa0c3c14 100644 --- a/THANKS +++ b/THANKS @@ -42,6 +42,7 @@ Christian Cornelssen ccorn@cs.tu-berlin.de 2002-11-05 Jan Kratochvil project-libtool@jankratochvil.net 2003-01-28 Raja R. Harinath harinath@acm.org 2003-02-25 + Paolo Bonzini bonzini@gnu.org 2003-03-01 Richard Nicholas Somer Dawe rich@phekda.freeserve.co.uk 2003-03-12 Peter O'Gorman peter@pogma.com 2003-03-14 Ralph Schleicher rs@nunatak.allgaeu.org 2003-03-13 @@ -55,7 +56,6 @@ Benjamin Reed ranger@befunk.com 2004-02-08 Ralf Wildenhues Ralf.Wildenhues@gmx.de 2004-02-12 Nick Hudson skrll@netbsd.org 2004-03-29 - Paolo Bonzini bonzini@gnu.org 2003-03-01 Noah Jeffrey Misch noah@cs.caltech.edu 2004-07-05 Thorsten Glaser tg@66h.42h.de 2004-10-11 Peter Rosin peda@lysator.liu.se 2005-04-12 @@ -118,11 +118,13 @@ John Wolfe jlw@sco.com Josh Hursey jjhursey@open-mpi.org Joseph Beckenbach III jrb3@best.com - Lennart Poettering lennart@poettering.net Karl Berry karl@freefriends.org Kenneth Albanowski kjahds@kjahds.com Kevin Ryde user42@zip.com.au + Khem Raj raj.khem@gmail.com Kurt D. Zeilenga Kurt@OpenLDAP.Org + Lennart Poettering lennart@poettering.net + Lionel Landwerlin llandwerlin@gmail.com Maciej Helminiak dion2@wp.pl Maciej W. Rozycki macro@linux-mips.org Mahesh Narayanamurthi mahesh.mach@gmail.com diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 1078e757b..af46cb861 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -8478,7 +8478,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"