qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH for-2.5??] configure: Fix shell syntax to placat


From: Paolo Bonzini
Subject: Re: [Qemu-devel] [PATCH for-2.5??] configure: Fix shell syntax to placate OpenBSD's pdksh
Date: Mon, 14 Dec 2015 17:04:17 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0


On 14/12/2015 16:02, Peter Maydell wrote:
> Unfortunately the OpenBSD pdksh does not like brackets inside
> the right part of a ${variable+word} parameter expansion:
> 
>   $ echo "${a+($b)}"
>   ksh: ${a+($b)}": bad substitution
> 
> though both bash and dash accept them. In any case this line
> was causing odd output in the case where nettle is not present:
>   nettle    no ()
> 
> (because if nettle is not present then $nettle will be "no",
> not a null string or unset).
> 
> Rewrite it to just use an if.
> 
> This bug was originally introduced in becaeb726 and was present
> in the 2.4.0 release.
> 
> Fixes: https://bugs.launchpad.net/qemu/+bug/1525682
> Reported-by: Dmitrij D. Czarkoff
> Signed-off-by: Peter Maydell <address@hidden>
> ---
> This fixes a problem where configure just falls over on OpenBSD,
> but on the other hand it is not a regression since 2.4.0...
> Opinions on whether we should put it in 2.5 as a last minute
> thing welcome.

Harmless enough that it shouldn't warrant an extra rc.

Paolo

>  configure | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index b9552fd..6ca6c64 100755
> --- a/configure
> +++ b/configure
> @@ -4758,7 +4758,11 @@ echo "GTK GL support    $gtk_gl"
>  echo "GNUTLS support    $gnutls"
>  echo "GNUTLS hash       $gnutls_hash"
>  echo "libgcrypt         $gcrypt"
> -echo "nettle            $nettle ${nettle+($nettle_version)}"
> +if test "$nettle" = "yes"; then
> +    echo "nettle            $nettle ($nettle_version)"
> +else
> +    echo "nettle            $nettle"
> +fi
>  echo "libtasn1          $tasn1"
>  echo "VTE support       $vte"
>  echo "curses support    $curses"
> 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]