libtool-patches
[Top][All Lists]
Advanced

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

Re: [PATCH] Adding dirs for installed libraries to temp_rpath is breakin


From: Albert Chin
Subject: Re: [PATCH] Adding dirs for installed libraries to temp_rpath is breaking builds on darwin8
Date: Wed, 2 Feb 2005 12:51:03 -0600
User-agent: Mutt/1.5.6i

On Thu, Feb 03, 2005 at 12:24:29AM +0900, Peter O'Gorman wrote:
> Index: ChangeLog
> 2005-02-01  Peter O'Gorman  <address@hidden>
> 
>       * ltmain.in [darwin]: Don't add installed libs to temp_rpath when
>       building executables on darwin, or other systems which use
>       hardcode_automatic. It may break our wrapper scripts.
> 
> from  Ralf Wildenhues  <address@hidden>
> Index: ltmain.in
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
> retrieving revision 1.334.2.52
> diff -u -3 -p -u -r1.334.2.52 ltmain.in
> --- ltmain.in 1 Feb 2005 07:35:38 -0000 1.334.2.52
> +++ ltmain.in 2 Feb 2005 15:19:28 -0000
> @@ -2222,6 +2222,8 @@ EOF
>       # it will not redefine variables installed, or shouldnotlink
>       installed=yes
>       shouldnotlink=no
> +     avoidtemprpath=
> +
>  
>       # Read the .la file
>       case $lib in
> @@ -2320,6 +2322,7 @@ EOF
>           dir="$libdir"
>           absdir="$libdir"
>         fi
> +       test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
>       else
>         if test ! -f "$ladir/$objdir/$linklib" && test -f 
> "$abs_ladir/$linklib"; then
>           dir="$ladir"
> @@ -2404,7 +2407,7 @@ EOF
>         if test -n "$library_names" &&
>            { test "$prefer_static_libs" = no || test -z "$old_library"; }; 
> then
>           # We need to hardcode the library path
> -         if test -n "$shlibpath_var"; then
> +         if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
>             # Make sure the rpath contains only unique directories.
>             case "$temp_rpath " in
>             *" $dir "*) ;;

Why isn't this a one-line patch?
> +         if test -n "$shlibpath_var" && \
>           test "X$hardcode_automatic" = Xyes; then

-- 
albert chin (address@hidden)




reply via email to

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