From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48598)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZPox5-0002iK-Rd
	for qemu-devel@nongnu.org; Thu, 13 Aug 2015 05:37:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZPox0-0004R1-Nm
	for qemu-devel@nongnu.org; Thu, 13 Aug 2015 05:37:35 -0400
Received: from mx1.redhat.com ([209.132.183.28]:38650)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZPox0-0004Qx-IY
	for qemu-devel@nongnu.org; Thu, 13 Aug 2015 05:37:30 -0400
References: <1439386633-18933-1-git-send-email-pbonzini@redhat.com>
	<CAFEAcA_Cd2XyiCCvxCjGvZax6OE-wffQwSUc0cHHOKvGP2yq6w@mail.gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <55CC6550.4020003@redhat.com>
Date: Thu, 13 Aug 2015 11:37:20 +0200
MIME-Version: 1.0
In-Reply-To: <CAFEAcA_Cd2XyiCCvxCjGvZax6OE-wffQwSUc0cHHOKvGP2yq6w@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL 00/20] SCSI, build, TCG, RCU,
 misc patches for 2015-08-12
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>



On 13/08/2015 11:28, Peter Maydell wrote:
> config-host.mak is out-of-date, running configure
> ../../configure: 2789: local: -I/usr/include/glib-2.0: bad variable nam=
e
>=20
> line 2789 is
> local probe_cflags=3D$($pkg_config --cflags $1)
>=20
> 'local' isn't part of POSIX shell. It is supported by 'dash', but
> only in the form 'local varname ...', not the bash-specific
> 'local varname=3Dvalue ...' form.

This is not entirely correct; dash is clearly supporting assignments in
local as well; we have:

    local compiler=3D"$1"

However, it's not automatically quoting the RHS of the assignment, like
normal variable assignment does.  But since this RHS is a bit more
complex than usual, I'll just apply this:

diff --git a/configure b/configure
index 28bf755..6faeb00 100755
--- a/configure
+++ b/configure
@@ -2787,8 +2787,10 @@ fi
 glib_pkg_config()
 {
   if $pkg_config --atleast-version=3D$glib_req_ver $1; then
-    local probe_cflags=3D$($pkg_config --cflags $1)
-    local probe_libs=3D$($pkg_config --libs $1)
+    local probe_cflags
+    local probe_libs
+    probe_cflags=3D$($pkg_config --cflags $1)
+    probe_libs=3D$($pkg_config --libs $1)
     CFLAGS=3D"$probe_cflags $CFLAGS"
     LIBS=3D"$probe_libs $LIBS"
     libs_qga=3D"$probe_libs $libs_qga"

Paolo