[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 04/35] configure: Fix shell syntax to placate OpenB
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 04/35] configure: Fix shell syntax to placate OpenBSD's pdksh |
Date: |
Mon, 21 Mar 2016 12:28:02 -0500 |
From: Peter Maydell <address@hidden>
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
Cc: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
(cherry picked from commit 18f49881cf8359e89396aac12f5d3cf3f8a632ba)
Signed-off-by: Michael Roth <address@hidden>
---
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"
--
1.9.1
- [Qemu-stable] [PATCH 32/35] vhost-user: don't merge regions with different fds, (continued)
- [Qemu-stable] [PATCH 32/35] vhost-user: don't merge regions with different fds, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 31/35] fw_cfg: unbreak migration compatibility for 2.4 and earlier machines, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 33/35] target-arm: Make reserved ranges in ID_AA64* spaces RAZ, not UNDEF, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 22/35] fw_cfg: avoid calculating invalid current entry pointer, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 34/35] quorum: Fix crash in quorum_aio_cb(), Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 28/35] spapr: skip configuration section during migration of older machines, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 02/35] net: vmxnet3: avoid memory leakage in activate_device, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 04/35] configure: Fix shell syntax to placate OpenBSD's pdksh,
Michael Roth <=
- [Qemu-stable] [PATCH 05/35] xen/blkif: Avoid double access to src->nr_segments, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 08/35] scsi: initialise info object with appropriate size, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 07/35] virtio-9p: use accessor to get thread_pool, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 06/35] xenfb: avoid reading twice the same fields from the shared page, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 35/35] vl.c: Fix regression in machine error message, Michael Roth, 2016/03/21
- [Qemu-stable] [PATCH 03/35] target-ppc: kvm: fix floating point registers sync on little-endian hosts, Michael Roth, 2016/03/21
- Re: [Qemu-stable] [PATCH 00/35] Patch Round-up for stable 2.5.1, freeze on 2016-03-25, Cole Robinson, 2016/03/21
- Re: [Qemu-stable] [PATCH 00/35] Patch Round-up for stable 2.5.1, freeze on 2016-03-25, Peter Lieven, 2016/03/22