[src/trunk]: src/crypto/external/bsd/netpgp/dist/buildaux Apply the patch pro...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/netpgp/dist/buildaux Apply the patch pro...
From: agc <agc%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:28:37 +0000
details:   https://anonhg.NetBSD.org/src/rev/256e6f3aac20
branches:  trunk
changeset: 758482:256e6f3aac20
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Nov 05 23:37:57 2010 +0000

description:
Apply the patch provided in PR 44047 by Peter Pentchev to fix a problem
in the GNU autoconf infrastructure with ltmain.sh script - change all
occurrences of "$echo" to "$ECHO".

(Incidentally, this does not show up under pkgsrc, since pkgsrc uses
the platform's libtool instead of the script which comes with the
distribution)

diffstat:

 crypto/external/bsd/netpgp/dist/buildaux/ltmain.sh |  954 ++++++++++----------
 1 files changed, 477 insertions(+), 477 deletions(-)

diffs (truncated from 2803 to 300 lines):

diff -r b6db5e3fda1b -r 256e6f3aac20 crypto/external/bsd/netpgp/dist/buildaux/ltmain.sh
--- a/crypto/external/bsd/netpgp/dist/buildaux/ltmain.sh        Fri Nov 05 19:50:18 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/buildaux/ltmain.sh        Fri Nov 05 23:37:57 2010 +0000
@@ -60,18 +60,18 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# Check that we have a working $echo.
+# Check that we have a working $ECHO.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
+elif test "X`($ECHO '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
   :
 else
-  # Restart under the correct shell, and then maybe $echo will work.
+  # Restart under the correct shell, and then maybe $ECHO will work.
   exec $SHELL "$progpath" --no-reexec ${1+"$@"}
 fi
 
@@ -134,8 +134,8 @@
 IFS="  $lt_nl"
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  $ECHO "$modename: not configured to build any kind of library" 1>&2
+  $ECHO "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
   exit $EXIT_FAILURE
 fi
 
@@ -145,7 +145,7 @@
 prev=
 prevopt=
 run=
-show="$echo"
+show="$ECHO"
 show_help=
 execute_dlfiles=
 duplicate_deps=no
@@ -187,12 +187,12 @@
 
       # If we're not in dry-run mode, bomb out on failure
       test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+        $ECHO "cannot create temporary directory \`$my_tmpdir'" 1>&2
        exit $EXIT_FAILURE
       }
     fi
 
-    $echo "X$my_tmpdir" | $Xsed
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
@@ -238,7 +238,7 @@
     esac
     ;;
   esac
-  $echo $win32_libid_type
+  $ECHO $win32_libid_type
 }
 
 
@@ -254,7 +254,7 @@
     tag_compilers_CC="*cc *xlc"
     tag_compilers_CXX="*++ *CC"
     tag_compilers_F77="*77 *fort"
-    base_compiler=`set -- "$@"; $echo $1`
+    base_compiler=`set -- "$@"; $ECHO $1`
     # If $tagname still isn't set, then try to infer if the default
     # "CC" tag applies by matching up the base compile command to some
     # compilers commonly used for the "CC" tag.
@@ -288,7 +288,7 @@
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -307,7 +307,7 @@
            CC_quoted="$CC_quoted $arg"
          done
            case "$@ " in
-             " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+             " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
              # The compiler in the base compile command matches
              # the one in the tagged configuration.
              # Assume this is the tagged configuration we want.
@@ -318,7 +318,7 @@
            # If $tagname still isn't set, then try to infer it by
            # matching up the base compile command to some compilers
            # commonly used for certain tags.
-           base_compiler=`set -- "$@"; $echo $1`
+           base_compiler=`set -- "$@"; $ECHO $1`
            eval "tag_compilers=\$tag_compilers_${z}"
            if test -n "$tag_compilers"; then
              for zp in $tag_compilers; do
@@ -342,11 +342,11 @@
        # was found and let the user know that the "--tag" command
        # line option must be used.
        if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
-         $echo "$modename: specify a tag with \`--tag'" 1>&2
+         $ECHO "$modename: unable to infer tagged configuration"
+         $ECHO "$modename: specify a tag with \`--tag'" 1>&2
          exit $EXIT_FAILURE
 #        else
-#          $echo "$modename: using $tagname tagged configuration"
+#          $ECHO "$modename: using $tagname tagged configuration"
        fi
        ;;
       esac
@@ -365,7 +365,7 @@
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      $ECHO "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
       exit $EXIT_FAILURE
     fi
 }
@@ -396,7 +396,7 @@
        [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
        *) my_xabs=`pwd`"/$my_xlib" ;;
       esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xlib=`$ECHO "X$my_xlib" | $Xsed -e 's%^.*/%%'`
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -426,7 +426,7 @@
          cd $my_xdir || exit $?
          darwin_archive=$my_xabs
          darwin_curdir=`pwd`
-         darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+         darwin_base_archive=`$ECHO "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
          darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
          if test -n "$darwin_arches"; then 
            darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
@@ -479,7 +479,7 @@
   shift
 
   case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  -*=*) optarg=`$ECHO "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
   *) optarg= ;;
   esac
 
@@ -496,7 +496,7 @@
       # Check whether tagname contains only valid characters
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
-       $echo "$progname: invalid tag name: $tagname" 1>&2
+       $ECHO "$progname: invalid tag name: $tagname" 1>&2
        exit $EXIT_FAILURE
        ;;
       esac
@@ -512,7 +512,7 @@
          # Evaluate the configuration.
          eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
        else
-         $echo "$progname: ignoring unknown tag $tagname" 1>&2
+         $ECHO "$progname: ignoring unknown tag $tagname" 1>&2
        fi
        ;;
       esac
@@ -553,7 +553,7 @@
     ;;
 
   --debug)
-    $echo "$progname: enabling shell trace mode"
+    $ECHO "$progname: enabling shell trace mode"
     set -x
     preserve_args="$preserve_args $arg"
     ;;
@@ -563,16 +563,16 @@
     ;;
 
   --features)
-    $echo "host: $host"
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      $echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      $echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
     exit $?
     ;;
@@ -607,8 +607,8 @@
     ;;
 
   -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
+    $ECHO "$modename: unrecognized option \`$arg'" 1>&2
+    $ECHO "$help" 1>&2
     exit $EXIT_FAILURE
     ;;
 
@@ -620,8 +620,8 @@
 done
 
 if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
+  $ECHO "$modename: option \`$prevopt' requires an argument" 1>&2
+  $ECHO "$help" 1>&2
   exit $EXIT_FAILURE
 fi
 
@@ -646,8 +646,8 @@
 
   # Infer the operation mode.
   if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+    $ECHO "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $ECHO "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
     case $nonopt in
     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC)
       mode=link
@@ -677,9 +677,9 @@
       # Just use the default operation mode.
       if test -z "$mode"; then
        if test -n "$nonopt"; then
-         $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+         $ECHO "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
        else
-         $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+         $ECHO "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
        fi
       fi
       ;;
@@ -688,8 +688,8 @@
 
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
+    $ECHO "$modename: unrecognized option \`-dlopen'" 1>&2
+    $ECHO "$help" 1>&2
     exit $EXIT_FAILURE
   fi
 
@@ -731,7 +731,7 @@
        case $arg in
        -o)
          if test -n "$libobj" ; then
-           $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+           $ECHO "$modename: you cannot specify \`-o' more than once" 1>&2
            exit $EXIT_FAILURE
          fi
          arg_mode=target
@@ -754,7 +754,7 @@
          ;;            #  replaced later.  I would guess that would be a bug.
 
        -Wc,*)
-         args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+         args=`$ECHO "X$arg" | $Xsed -e "s/^-Wc,//"`
          lastarg=
          save_ifs="$IFS"; IFS=','
          for arg in $args; do
@@ -771,7 +771,7 @@
            lastarg="$lastarg $arg"
          done
          IFS="$save_ifs"
-         lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+         lastarg=`$ECHO "X$lastarg" | $Xsed -e "s/^ //"`
 
          # Add the arguments to base_compile.
          base_compile="$base_compile $lastarg"
@@ -790,7 +790,7 @@
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+      lastarg=`$ECHO "X$lastarg" | $Xsed -e "$sed_quote_subst"`
 
       case $lastarg in
       # Double-quote args containing other shell metacharacters.
@@ -809,16 +809,16 @@
Prev by Date: [src/trunk]: src/sys/dev/pci Correct copy/paste error in as-of-yet-unused pci...
Next by Date: [src/trunk]: src/sys/dev/pci pciide(4): Sprinkle static, add detachment support.
Previous by Thread: [src/trunk]: src/sys/dev/pci Correct copy/paste error in as-of-yet-unused pci...
Next by Thread: [src/trunk]: src/sys/dev/pci pciide(4): Sprinkle static, add detachment support.
Indexes:
Home | Main Index | Thread Index | Old Index