Re: [PATCH] ./tools/wineinstall *correct (.diff) format*

[Alexandre Julliard]

Speeddymon  writes:
> ModifiedFiles: tools/wineinstall
>
> RCS file: /home/wine/wine/tools/wineinstall,v
> retrieving revision 1.26
> diff -u -r1.26 wineinstall
> --- wineinstall	1 Apr 2002 20:56:51 -0000	1.26
> +++ wineinstall	17 Apr 2002 23:06:39 -0000
> @@ -291,6 +310,14 @@
>        sucommand="echo $libdir>>/etc/ld.so.conf;ldconfig;$sucommand"
>      }
>      fi
> - if [ -f /etc/ld.so.conf ] && ! grep -qs "$libdir/wine" /etc.ld.so.conf
> - then {
> -
>  echo
> -
>  echo "$libdir/wine doesn't exist in your /etc/ld.so.conf, it will be"
> -
>  echo " added when we perform the install..."
> -
>  sucommand="echo $libdir/wine>>/etc/ld.so.conf;$sucommand"
> - }
> - fi

$libdir/wine must not be added to ld.so.conf. Users have to set the
WINEDLLPATH variable if Wine is not installed in the directory that
was specified with --prefix (which shouldn't happen with
wineinstall).

[PATCH] ./tools/wineinstall *correct (.diff) format*

[Speeddymon]

well something isn't right with the current
wineinstall, because I installed wine to the default
directories, and it wasn't finding libntdll.dll.so
until after I added $libdir/wine.  I'm not sure why
that happened, I will do some checking tonight and
find out why it wasn't finding the file.

I'm thinking maybe it added $libdir to ld.so.conf but
didnt run ldconfig... ?  I will check that out tonight
and a couple other possibilities and let you know the
outcome tomorrow...
--- Alexandre Julliard  wrote:
> $libdir/wine must not be added to ld.so.conf. Users
> have to set the
> WINEDLLPATH variable if Wine is not installed in the
> directory that
> was specified with --prefix (which shouldn't happen
> with
> wineinstall).
>
> -- 
> Alexandre Julliard
> [e-mail]

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/

[PATCH] ./tools/wineinstall *correct (.diff) format*

In , on 04/23/02 
   at 02:24 PM, Speeddymon  said:

:I'm thinking maybe it added $libdir to ld.so.conf but
:didnt run ldconfig... ?

What actually happened is that $libdir was already in ld.so.conf, so the
script did NOT add it, and therefore, it did NOT run ldconfig. This
strategy works when one upgrades modules with identical names, but not
when modules are renamed, as was the case with libntdll.dll.so replacing
libntdll.so.

The line in wineinstall which controls this behavior is:

if [ -f /etc/ld.so.conf ] && ! grep -qs "$libdir" /etc/ld.so.conf

-- Chuck Crayne
-----------------------------------------------------------
[e-mail]
-----------------------------------------------------------

[PATCH] ./tools/wineinstall *correct (.diff) format*

[Martin Wilck]

On Tue, 23 Apr 2002 [e-mail] wrote:
> :I'm thinking maybe it added $libdir to ld.so.conf but
> :didnt run ldconfig... ?

What about simply setting LD_LIBRARY_PATH?

Martin

[PATCH] ./tools/wineinstall *correct (.diff) format*

[Speeddymon]

--- Martin Wilck 
wrote:
> On Tue, 23 Apr 2002 [e-mail] wrote:
> > :I'm thinking maybe it added $libdir to ld.so.conf
>
> but
> > :didnt run ldconfig... ?
>
> What about simply setting LD_LIBRARY_PATH?
>
> Martin

I would except that I was installing in the default
dirs...(i.e. --prefix=/usr/local) etc, so there was no
need to set LD_LIBRARY_PATH

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/

[PATCH] ./tools/wineinstall *correct (.diff) format*

[Speeddymon]

> What actually happened is that $libdir was already
> in ld.so.conf, so the
> script did NOT add it, and therefore, it did NOT run
> ldconfig. This
> strategy works when one upgrades modules with
> identical names, but not
> when modules are renamed, as was the case with
> libntdll.dll.so replacing
> libntdll.so.
>
> The line in wineinstall which controls this behavior
> is:
>
> if [ -f /etc/ld.so.conf ] && ! grep -qs "$libdir"
> /etc/ld.so.conf
>
> -- Chuck Crayne

Ok, so now I'm wondering who set it up to not run
ldconfig if $libdir is in there...  I will fix that in
a minute and submit the patch later today...

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/