From patchwork Fri Mar 16 12:02:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Essen X-Patchwork-Id: 147190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 71984B7046 for ; Fri, 16 Mar 2012 23:02:57 +1100 (EST) Received: from localhost ([::1]:56644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Vrw-0001pS-Qs for incoming@patchwork.ozlabs.org; Fri, 16 Mar 2012 08:02:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Vrg-0001jo-UF for qemu-devel@nongnu.org; Fri, 16 Mar 2012 08:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8Vra-0006vK-KU for qemu-devel@nongnu.org; Fri, 16 Mar 2012 08:02:36 -0400 Received: from 204.146.238.178.in-addr.arpa ([178.238.146.204]:43892 helo=mail.local) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Vra-0006v8-DR for qemu-devel@nongnu.org; Fri, 16 Mar 2012 08:02:30 -0400 Received: from 187.146.238.178.in-addr.arpa (187.146.238.178.in-addr.arpa [178.238.146.187]) by mail.local (Postfix) with ESMTPSA id D8FC14D63; Fri, 16 Mar 2012 12:02:28 +0000 (UTC) From: Lee Essen Date: Fri, 16 Mar 2012 12:02:28 +0000 Message-Id: <1087EBB0-5CF0-49F1-971F-EE8ADC5E06DB@nowonline.co.uk> To: qemu-devel@nongnu.org Mime-Version: 1.0 (Apple Message framework v1251.1) X-Mailer: Apple Mail (2.1251.1) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.238.146.204 Cc: =?iso-8859-1?Q?Andreas_F=E4rber?= Subject: [Qemu-devel] [PATCH 1/5] configure to set shell type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Adds support to configure for controlling which shell to use, defaults to "sh" as before but adds "bash" for Solaris/Illumos builds. Plus ensures that tracetool is called with a shell. Signed-off-by: Lee Essen --- configure | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index afe7395..860c15d 100755 --- a/configure +++ b/configure @@ -101,6 +101,7 @@ audio_win_int="" cc_i386=i386-pc-linux-gnu-gcc libs_qga="" debug_info="yes" +shell="sh" target_list="" @@ -442,6 +443,7 @@ SunOS) # have to select again, because `uname -m` returns i86pc # even on an x86_64 box. solariscpu=`isainfo -k` + shell="bash" if test "${solariscpu}" = "amd64" ; then cpu="x86_64" fi @@ -1097,7 +1099,7 @@ echo " --disable-docs disable documentation build" echo " --disable-vhost-net disable vhost-net acceleration support" echo " --enable-vhost-net enable vhost-net acceleration support" echo " --enable-trace-backend=B Set trace backend" -echo " Available backends:" $("$source_path"/scripts/tracetool --list-backends) +echo " Available backends:" $($shell "$source_path"/scripts/tracetool --list-backends) echo " --with-trace-file=NAME Full PATH,NAME of file to store traces" echo " Default:trace-" echo " --disable-spice disable spice" @@ -2654,7 +2656,7 @@ fi ########################################## # check if trace backend exists -sh "$source_path/scripts/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null +$shell "$source_path/scripts/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null if test "$?" -ne 0 ; then echo echo "Error: invalid trace backend" @@ -3358,6 +3360,7 @@ echo "LIBS+=$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak echo "LIBS_QGA+=$libs_qga" >> $config_host_mak +echo "SHELL=$shell" >> $config_host_mak # generate list of library paths for linker script