Re: [musl] [PATCH 1/2] configure: do not use obsolescent form of test -a|o

[Rich Felker <dalias@libc.org>]

On Sat, Oct 10, 2020 at 06:51:09PM +0000, Issam E. Maghni wrote:
> > The XSI extensions specifying the -a and -o binary primaries and the '(' and
> > ')' operators have been marked obsolescent.
> https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16
> 
> Signed-off-by: Issam E. Maghni <issam.e.maghni@mailbox.org>

Please keep commit messages to at most 76 columns, preferably less ala
email conventions, so that git log is readable in 80, and avoid block
quoting or other formatting that might not work well in all contexts
it's displayed in. A description is also preferred to quoting in
general, e.g. here:

    The -a and -o operators are obsolescent and not in baseline POSIX.

Also no need for S-o-b.

Otherwise the patch itself looks good. Thanks for catching this.

Rich




> ---
>  configure | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 947adf41..a5231a0e 100755
> --- a/configure
> +++ b/configure
> @@ -204,7 +204,7 @@ fi
>  abs_builddir="$(pwd)" || fail "$0: cannot determine working directory"
>  abs_srcdir="$(cd $srcdir && pwd)" || fail "$0: invalid source directory $srcdir"
>  test "$abs_srcdir" = "$abs_builddir" && srcdir=.
> -test "$srcdir" != "." -a -f Makefile -a ! -h Makefile && fail "$0: Makefile already exists in the working directory"
> +test "$srcdir" != "." && test -f Makefile && test ! -h Makefile && fail "$0: Makefile already exists in the working directory"
>  
>  #
>  # Get a temp filename we can use
> @@ -279,7 +279,7 @@ echo "$cc_family"
>  #
>  # Figure out toolchain wrapper to build
>  #
> -if test "$wrapper" = auto -o "$wrapper" = detect ; then
> +if test "$wrapper" = auto || test "$wrapper" = detect ; then
>  echo "#include <stdlib.h>" > "$tmpc"
>  echo "#if ! __GLIBC__" >> "$tmpc"
>  echo "#error no" >> "$tmpc"
> @@ -468,7 +468,7 @@ tryflag CFLAGS_AUTO -pipe
>  # pointer is no longer needed for debugging.
>  #
>  if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" ; then :
> -else 
> +else
>  tryflag CFLAGS_AUTO -fomit-frame-pointer
>  fi
>  
> -- 
> 2.28.0