[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: darwin_relink.diff
From: |
Robert Boehne x238 |
Subject: |
Re: darwin_relink.diff |
Date: |
Wed, 09 Apr 2003 12:53:14 -0500 |
Peter,
Looks good to me, I'm approving an checking in.
Thanks!
Robert
Peter O'Gorman wrote:
>
> Hi again,
>
> I was curious how to turn off relinking on darwin, as it is never
> needed, the install path is the only path encoded in libraries and
> executables, and it is done automatically during linking. While looking
> at this I noticed that the AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH test
> checks the value of shlibpath_overrides_runpath in order to decide if
> fast_install is yes, no, or needless. Problem being that the
> shlibpath_overrides_runpath is set in AC_LIBTOOL_SYS_DYNAMIC_LINKER
> which is currently called *after* the hardcode_libpath test. I moved
> the dynamic_linker test to be before it.
>
> Thanks,
> Peter
>
> Index: ChangeLog
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ChangeLog,v
> retrieving revision 1.1220
> diff -u -d -b -w -r1.1220 ChangeLog
> --- ChangeLog 5 Apr 2003 19:32:58 -0000 1.1220
> +++ ChangeLog 9 Apr 2003 14:08:35 -0000
> @@ -1,3 +1,11 @@
> +2003-04-09 Peter O'Gorman <address@hidden>
> +
> + * libtool.m4: Move the AC_LIBTOOL_SYS_DYNAMIC_LINKER check
> + to be before AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, becuase the
> + value of shlibpath_overrides_runpath is used in the HARDCODE
> + test and is set in the DYNAMIC_LINKER test.
> + * ltmain.in(darwin): We never need to relink on darwin.
> +
> 2003-04-05 Peter O'Gorman <address@hidden>
>
> * libtool.m4: if ZSH_VERSION is set then setopt NO_GLOB_SUBST so
> Index: libtool.m4
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/libtool.m4,v
> retrieving revision 1.314
> diff -u -d -b -w -r1.314 libtool.m4
> --- libtool.m4 5 Apr 2003 19:32:58 -0000 1.314
> +++ libtool.m4 9 Apr 2003 14:08:36 -0000
> @@ -2510,9 +2510,9 @@
> AC_LIBTOOL_PROG_CC_C_O($1)
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
> AC_LIBTOOL_SYS_LIB_STRIP
> -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_DLOPEN_SELF($1)
>
> # Report which librarie types wil actually be built
> @@ -3442,9 +3442,9 @@
> AC_LIBTOOL_PROG_CC_C_O($1)
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
> AC_LIBTOOL_SYS_LIB_STRIP
> -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_DLOPEN_SELF($1)
>
> AC_LIBTOOL_CONFIG($1)
> @@ -3686,9 +3686,10 @@
> AC_LIBTOOL_PROG_CC_C_O($1)
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
> AC_LIBTOOL_SYS_LIB_STRIP
> -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> +
>
> AC_LIBTOOL_CONFIG($1)
>
> @@ -3740,9 +3741,9 @@
> AC_LIBTOOL_PROG_CC_C_O($1)
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
> AC_LIBTOOL_SYS_LIB_STRIP
> -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_DLOPEN_SELF($1)
>
> AC_LIBTOOL_CONFIG($1)
> Index: ltmain.in
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ltmain.in,v
> retrieving revision 1.334
> diff -u -d -b -w -r1.334 ltmain.in
> --- ltmain.in 2 Apr 2003 16:44:38 -0000 1.334
> +++ ltmain.in 9 Apr 2003 14:08:36 -0000
> @@ -5051,7 +5051,9 @@
> # Quote the link command for shipping.
> relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args
> @inst_prefix_dir@)"
> relink_command=`$echo "X$relink_command" | $Xsed -e
> "$sed_quote_subst"`
> -
> + if test "$hardcode_automatic" = yes ; then
> + relink_command=
> + fi
> # Only create the output if not a dry run.
> if test -z "$run"; then
> for installed in no yes; do
>
> ----------------------------------------------------------------------
> Name: darwin_relink.diff.gz
> darwin_relink.diff.gz Type: application/x-gzip
> Encoding: base64
>
> ----------------------------------------------------------------------
> _______________________________________________
> Libtool-patches mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/libtool-patches
--
Robert Boehne Software Engineer
Ricardo Software Chicago Technical Center
TEL: (630)789-0003 x. 238
FAX: (630)789-0127
email: rboehne AT ricardo-us DOT com
- darwin_relink.diff, Peter O'Gorman, 2003/04/09
- Re: darwin_relink.diff,
Robert Boehne x238 <=