You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Sander Striker <st...@apache.org> on 2002/04/17 12:22:27 UTC

[PATCH] instdso.sh, WAS: RE: FW: shared dav_svn is not relinking

Reposting with a [PATCH] subject...

> From: Sander Striker [mailto:striker@apache.org]
> Sent: 14 April 2002 13:24

>> From: trawick@rdu88-250-035.nc.rr.com
>> [mailto:trawick@rdu88-250-035.nc.rr.com]On Behalf Of Jeff Trawick
>> Sent: 13 April 2002 02:44
> 
>> "Sander Striker" <st...@apache.org> writes:
>> 
>> > Since this might be an apxs issue I'm forwarding this here.
>> > Any clues?
>> 
>> Well, we (I) started using instdso.sh instead of libtool --install
>> because with libtool --install
>> 
>> 1) what the user has to code with LoadModule to get mod_foo loaded
>>    varies between operating systems and libtool versions
>> 
>> 2) we get a bunch of crap installed in the lib directory that we don't
>>    need
>> 
>> Obviously somebody found a drawback to this bit of libtool-avoidance.
>> 
>> :( :( :(
> 
> Yes, and we should fix it.

Currently, when you blow away the subversion _build_ directory, mod_dav_svn
stops working, because it isn't being relinked.  I'd rather not have
subversion circumvent apxs to install mod_dav_svn...

> This patch works for me.  Not an expert on libtool, so I'd like some feedback.
> 
> Sander
> 
> --- instdso.sh.old    Wed Feb 20 21:11:32 2002
> +++ instdso.sh        Sun Apr 14 13:00:25 2002
> @@ -5,8 +5,9 @@
>  # we use this instead of libtool --install because:
>  # 1) on a few platforms libtool doesn't install DSOs exactly like we'd
>  #    want (weird names, doesn't remove DSO first)
> -# 2) we never want the .la files copied, so we might as well copy
> -#    the .so files ourselves
> +# 2) we never want the .la files copied, so we remove them after
> +#    libtool has installed them.  We need to use libtool to make
> +#    the installed dsos relink properly.
> 
>  if test "$#" != "3"; then
>      echo "wrong number of arguments to instdso.sh"
> @@ -49,7 +50,10 @@
>          $CMD || exit $?
>          ;;
>      *)
> -        CMD="cp .libs/$TARGET_NAME $TARGETDIR/$TARGET_NAME"
> +        CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
> +        echo $CMD
> +        $CMD || exit $?
> +        CMD="rm -f $TARGETDIR/$DSOBASE.a $TARGETDIR/$DSOBASE.la"
>          echo $CMD
>          $CMD || exit $?
>          ;;