From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQ0jb-0007x2-7l for qemu-devel@nongnu.org; Sun, 21 Oct 2012 14:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQ0jZ-0002Iz-W4 for qemu-devel@nongnu.org; Sun, 21 Oct 2012 14:58:51 -0400 Message-ID: <508445DD.9020802@msgid.tls.msk.ru> Date: Sun, 21 Oct 2012 22:58:37 +0400 From: Michael Tokarev MIME-Version: 1.0 References: <507EE645.7040403@siemens.com> <20121019193315.GG22247@ohm.aurel32.net> In-Reply-To: <20121019193315.GG22247@ohm.aurel32.net> Content-Type: multipart/mixed; boundary="------------000504010901000007060205" Subject: Re: [Qemu-devel] [PATCH] configure: Fix CONFIG_QEMU_HELPERDIR generation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno Cc: Jan Kiszka , Anthony Liguori , Corey Bryant , qemu-devel , qemu-stable This is a multi-part message in MIME format. --------------000504010901000007060205 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit On 19.10.2012 23:33, Aurelien Jarno wrote: > On Wed, Oct 17, 2012 at 07:09:25PM +0200, Jan Kiszka wrote: >> We need to evaluate $libexecdir in configure, otherwise we literally end >> up with "${prefix}/libexec" instead of the absolute path as >> CONFIG_QEMU_HELPERDIR. >> >> Signed-off-by: Jan Kiszka >> --- >> configure | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/configure b/configure >> index 353d788..e3a1780 100755 >> --- a/configure >> +++ b/configure >> @@ -3227,7 +3227,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak >> echo "qemu_datadir=$qemu_datadir" >> $config_host_mak >> echo "qemu_docdir=$qemu_docdir" >> $config_host_mak >> echo "qemu_localstatedir=$local_statedir" >> $config_host_mak >> -echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak >> +echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak Somehow I missed this patch, and especially missed this case when testing initial change. And I think this is a wrong approach too. This should be defined as qemu_helperdir variable instead of CONFIG_QEMU_HELPERDIR, just like all other qemu_*dirs around, and scripts/create_config will take care of it by expanding the variable and providing CONFIG_QEMU_HELPERDIR #define. Something like the attached. Thanks, /mjt --------------000504010901000007060205 Content-Type: text/x-patch; name="0001-fix-CONFIG_QEMU_HELPERDIR-generation-again.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-fix-CONFIG_QEMU_HELPERDIR-generation-again.patch" >>From 58de50012972699e6bb1362ba39e3326d8f65152 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sun, 21 Oct 2012 22:52:54 +0400 Subject: [PATCH] fix CONFIG_QEMU_HELPERDIR generation again commit 38f419f35225 fixed a breakage with CONFIG_QEMU_HELPERDIR which has been introduced by 8bf188aa18ef7a8. But while techinically that fix has been correct, all other similar variables are handled differently. Make it consistent, and let scripts/create_config expand and capitalize the variable properly like for all other qemu_*dir variables. Signed-off-by: Michael Tokarev --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 9f33c7d..fa5657f 100755 --- a/configure +++ b/configure @@ -3200,7 +3200,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_docdir=$qemu_docdir" >> $config_host_mak echo "qemu_localstatedir=$local_statedir" >> $config_host_mak -echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak +echo "qemu_helperdir=$libexecdir" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak if test "$debug_tcg" = "yes" ; then -- 1.7.10.4 --------------000504010901000007060205--