[BACK]Return to compile CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga

Diff for /embedaddon/quagga/compile between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 11:53:40 version 1.1.1.3, 2012/10/09 09:22:28
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.# Wrapper for compilers which do not understand '-c -o'.
   
scriptversion=2010-11-15.09; # UTCscriptversion=2012-03-05.13; # UTC
   
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
# Foundation, Inc.# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.  # Written by Tom Tromey <tromey@cygnus.com>.
 #  #
 # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
Line 40  file_conv= Line 40  file_conv=
   
 # func_file_conv build_file lazy  # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file  # Convert a $build file to $host form and store it in $file
# Currently only supports Win32 hosts. If the determined conversion# Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will  # type is listed in (the comma separated) LAZY, no conversion will
 # take place.  # take place.
 func_file_conv ()  func_file_conv ()
Line 79  func_file_conv () Line 79  func_file_conv ()
   esac    esac
 }  }
   
   # func_cl_dashL linkdir
   # Make cl look for libraries in LINKDIR
   func_cl_dashL ()
   {
     func_file_conv "$1"
     if test -z "$lib_path"; then
       lib_path=$file
     else
       lib_path="$lib_path;$file"
     fi
     linker_opts="$linker_opts -LIBPATH:$file"
   }
   
   # func_cl_dashl library
   # Do a library search-path lookup for cl
   func_cl_dashl ()
   {
     lib=$1
     found=no
     save_IFS=$IFS
     IFS=';'
     for dir in $lib_path $LIB
     do
       IFS=$save_IFS
       if $shared && test -f "$dir/$lib.dll.lib"; then
         found=yes
         lib=$dir/$lib.dll.lib
         break
       fi
       if test -f "$dir/$lib.lib"; then
         found=yes
         lib=$dir/$lib.lib
         break
       fi
     done
     IFS=$save_IFS
   
     if test "$found" != yes; then
       lib=$lib.lib
     fi
   }
   
 # func_cl_wrapper cl arg...  # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl  # Adjust compile command to suit cl
 func_cl_wrapper ()  func_cl_wrapper ()
Line 94  func_cl_wrapper () Line 136  func_cl_wrapper ()
     else      else
       case $1 in        case $1 in
         -o)          -o)
          # configure might choose to run compile as `compile cc -o foo foo.c'.          # configure might choose to run compile as 'compile cc -o foo foo.c'.
           eat=1            eat=1
           case $2 in            case $2 in
             *.o | *.[oO][bB][jJ])              *.o | *.[oO][bB][jJ])
Line 109  func_cl_wrapper () Line 151  func_cl_wrapper ()
               ;;                ;;
           esac            esac
           ;;            ;;
           -I)
             eat=1
             func_file_conv "$2" mingw
             set x "$@" -I"$file"
             shift
             ;;
         -I*)          -I*)
           func_file_conv "${1#-I}" mingw            func_file_conv "${1#-I}" mingw
           set x "$@" -I"$file"            set x "$@" -I"$file"
           shift            shift
           ;;            ;;
           -l)
             eat=1
             func_cl_dashl "$2"
             set x "$@" "$lib"
             shift
             ;;
         -l*)          -l*)
          lib=${1#-l}          func_cl_dashl "${1#-l}"
          found=no          set x "$@" "$lib"
          save_IFS=$IFS 
          IFS=';' 
          for dir in $lib_path $LIB 
          do 
            IFS=$save_IFS 
            if $shared && test -f "$dir/$lib.dll.lib"; then 
              found=yes 
              set x "$@" "$dir/$lib.dll.lib" 
              break 
            fi 
            if test -f "$dir/$lib.lib"; then 
              found=yes 
              set x "$@" "$dir/$lib.lib" 
              break 
            fi 
          done 
          IFS=$save_IFS 
 
          test "$found" != yes && set x "$@" "$lib.lib" 
           shift            shift
           ;;            ;;
           -L)
             eat=1
             func_cl_dashL "$2"
             ;;
         -L*)          -L*)
          func_file_conv "${1#-L}"          func_cl_dashL "${1#-L}"
          if test -z "$lib_path"; then 
            lib_path=$file 
          else 
            lib_path="$lib_path;$file" 
          fi 
          linker_opts="$linker_opts -LIBPATH:$file" 
           ;;            ;;
         -static)          -static)
           shared=false            shared=false
Line 196  eat= Line 229  eat=
   
 case $1 in  case $1 in
   '')    '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;       exit 1;
      ;;       ;;
   -h | --h*)    -h | --h*)
     cat <<\EOF      cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]  Usage: compile [--help] [--version] PROGRAM [ARGS]
   
Wrapper for compilers which do not understand `-c -o'.Wrapper for compilers which do not understand '-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remainingRemove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.  arguments, and rename the output as expected.
   
 If you are trying to build a whole package this is not the  If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.right script to run: please start by reading the file 'INSTALL'.
   
 Report bugs to <bug-automake@gnu.org>.  Report bugs to <bug-automake@gnu.org>.
 EOF  EOF
Line 233  do Line 266  do
   else    else
     case $1 in      case $1 in
       -o)        -o)
        # configure might choose to run compile as `compile cc -o foo foo.c'.        # configure might choose to run compile as 'compile cc -o foo foo.c'.
        # So we strip `-o arg' only if arg is an object.        # So we strip '-o arg' only if arg is an object.
         eat=1          eat=1
         case $2 in          case $2 in
           *.o | *.obj)            *.o | *.obj)
Line 261  do Line 294  do
 done  done
   
 if test -z "$ofile" || test -z "$cfile"; then  if test -z "$ofile" || test -z "$cfile"; then
  # If no `-o' option was seen then we might have been invoked from a  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a    # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no    # normal compilation that the losing compiler can handle.  If no
  # `.c' file was seen then we are probably linking.  That is also  # '.c' file was seen then we are probably linking.  That is also
   # ok.    # ok.
   exec "$@"    exec "$@"
 fi  fi
Line 273  fi Line 306  fi
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`  cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
   
 # Create the lock directory.  # Create the lock directory.
# Note: use `[/\\:.-]' here to ensure that we don't use the same name# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected  # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.  # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d  lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>