httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/build instdso.sh
Date Fri, 19 Apr 2002 14:04:30 GMT
trawick     02/04/19 07:04:30

  Modified:    .        CHANGES
               build    instdso.sh
  Log:
  Change instdso.sh to use libtool --install everywhere and then
  clean up some stray files and symlinks that libtool leaves around
  on some platforms.  This gets subversion building properly since
  it needed a re-link to be performed by libtool at install time,
  and the old instdso.sh logic to simply cp the DSO didn't handle
  that requirement.
  
  Submitted by: Sander Striker
  Reviewed by:  Jeff Trawick
  
  Revision  Changes    Path
  1.716     +7 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.715
  retrieving revision 1.716
  diff -u -r1.715 -r1.716
  --- CHANGES	18 Apr 2002 09:01:31 -0000	1.715
  +++ CHANGES	19 Apr 2002 14:04:29 -0000	1.716
  @@ -1,5 +1,12 @@
   Changes with Apache 2.0.36
   
  +  *) Change instdso.sh to use libtool --install everywhere and then
  +     clean up some stray files and symlinks that libtool leaves around
  +     on some platforms.  This gets subversion building properly since
  +     it needed a re-link to be performed by libtool at install time,
  +     and the old instdso.sh logic to simply cp the DSO didn't handle
  +     that requirement.  [Sander Striker]
  +
     *) Allow VPATH builds to succeed when configured from an empty
        directory.  [Thom May <thom@planetarytramp.net>]
   
  
  
  
  1.5       +36 -33    httpd-2.0/build/instdso.sh
  
  Index: instdso.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/instdso.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- instdso.sh	20 Feb 2002 20:11:32 -0000	1.4
  +++ instdso.sh	19 Apr 2002 14:04:30 -0000	1.5
  @@ -21,38 +21,41 @@
   TARGET_NAME="$DSOBASE.so"
   
   SYS=`uname -s`
  -case $SYS in
  -    AIX)
  -        # on AIX, shared libraries remain in storage even when
  -        # all processes using them have exited; standard practice
  -        # prior to installing a shared library is to rm -f first
  -        CMD="rm -f $TARGETDIR/$TARGET_NAME"
  -        echo $CMD
  -        $CMD || exit $?
  -        CMD="cp .libs/lib$DSOBASE.so.0 $TARGETDIR/$TARGET_NAME"
  -        echo $CMD
  -        $CMD || exit $?
  -        ;;
  -    HP-UX)
  -        CMD="cp .libs/$DSOBASE.sl $TARGETDIR/$TARGET_NAME"
  -        echo $CMD
  -        $CMD || exit $?
  -        ;;
  -    OSF1)
  -        CMD="cp .libs/lib$DSOBASE.so $TARGETDIR/$TARGET_NAME"
  -        echo $CMD
  -        $CMD || exit $?
  -        ;;
  -    OS/2|OS/390)
  -        CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
  -        echo $CMD
  -        $CMD || exit $?
  -        ;;
  -    *)
  -        CMD="cp .libs/$TARGET_NAME $TARGETDIR/$TARGET_NAME"
  -        echo $CMD
  -        $CMD || exit $?
  -        ;;
  -esac
  +
  +if test "$SYS" = "AIX"
  +then
  +    # on AIX, shared libraries remain in storage even when
  +    # all processes using them have exited; standard practice
  +    # prior to installing a shared library is to rm -f first
  +    CMD="rm -f $TARGETDIR/$TARGET_NAME"
  +    echo $CMD
  +    $CMD || exit $?
  +fi
  +
  +CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
  +echo $CMD
  +$CMD || exit $?
  +
  +DLNAME=`grep "^dlname" $TARGETDIR/$DSOARCHIVE | sed -e "s/dlname='\([^']*\)'/\1/"`
  +LIBRARY_NAMES=`grep "library_names" $TARGETDIR/$DSOARCHIVE | sed -e "s/dlname='\([^']*\)'/\1/"`
  +LIBRARY_NAMES=`echo $LIBRARY_NAMES | sed -e "s/ *$DLNAME//g"`
  +
  +if test -n "$LIBRARY_NAMES"
  +then
  +    for f in $LIBRARY_NAMES
  +    do
  +        rm -f $TARGETDIR/$f
  +    done
  +fi
  +
  +if test "$DLNAME" != "$TARGET_NAME"
  +then
  +    mv $TARGETDIR/$DLNAME $TARGETDIR/$TARGET_NAME
  +fi
  +
  +rm -f $TARGETDIR/$DSOARCHIVE
  +rm -f $TARGETDIR/$DSOBASE.a
  +rm -f $TARGETDIR/lib$DSOBASE.a
  +rm -f $TARGETDIR/lib$TARGET_NAME
   
   exit 0
  
  
  

Mime
View raw message