From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeyHE-0006zJ-VG
	for qemu-devel@nongnu.org; Wed, 04 Mar 2009 16:05:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeyH9-0006xP-Qn
	for qemu-devel@nongnu.org; Wed, 04 Mar 2009 16:05:16 -0500
Received: from [199.232.76.173] (port=47478 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeyH9-0006xK-Mk
	for qemu-devel@nongnu.org; Wed, 04 Mar 2009 16:05:11 -0500
Received: from mx.freeshell.org ([192.94.73.19]:60791 helo=sdf.lonestar.org)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <palle@sdf.lonestar.org>) id 1LeyH9-0005eN-2m
	for qemu-devel@nongnu.org; Wed, 04 Mar 2009 16:05:11 -0500
Received: from sdf.lonestar.org (IDENT:palle@otaku.freeshell.org [192.94.73.2])
	by sdf.lonestar.org (8.14.3/8.13.8) with ESMTP id n24L4cbd024680
	for <qemu-devel@nongnu.org>; Wed, 4 Mar 2009 21:04:38 GMT
Date: Wed, 4 Mar 2009 21:04:38 +0000 (UTC)
From: Palle Lyckegaard <palle@lyckegaard.dk>
Message-ID: <Pine.NEB.4.64.0903022047120.15645@otaku.freeshell.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Subject: [Qemu-devel] [PATCH] Get sh right on OpenSolaris/SPARC 
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


The patch below solves a problem when building qemu on OpenSolaris/SPARC.

"feature_to_c.sh: test: argument expected"

There seemes to be a problem with how "features_to_c.sh" is started from 
the makefile. On Solaris the shell in /bin/sh is not standards compliant 
according to http://docs.sun.com/app/docs/doc/816-5165/sh-1?a=view 
so the patch fixes the configure script so a proper sh in located in 
/usr/xpg4/bin when building on OpenSolaris. Other platforms defaults to 
whatever is in the path when configure is running.

Please consider this patch so qemu builds out-of-the-box for 
OpenSolaris...

Best regards
Palle

------ start of patch

Index: configure
===================================================================
--- configure   (revision 6657)
+++ configure   (working copy)
@@ -34,6 +34,7 @@
  make="make"
  install="install"
  strip="strip"
+shell="`which sh`"

  # parse CC options first
  for opt do
@@ -263,6 +264,7 @@
  SunOS)
      solaris="yes"
      make="gmake"
+    shell="/usr/xpg4/bin/sh"
      install="ginstall"
      needs_libsunmath="no"
      solarisrev=`uname -r | cut -f2 -d.`
@@ -1178,6 +1180,7 @@
  echo "INSTALL=$install" >> $config_mak
  echo "CC=$cc" >> $config_mak
  echo "HOST_CC=$host_cc" >> $config_mak
+echo "SHELL=$shell" >> $config_mak
  echo "AR=$ar" >> $config_mak
  echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
  # XXX: only use CFLAGS and LDFLAGS ?


------ end of patch