From patchwork Thu Dec 23 10:43:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 76497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D906B70A3 for ; Thu, 23 Dec 2010 22:00:59 +1100 (EST) Received: from localhost ([127.0.0.1]:38859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVium-0004tP-Dw for incoming@patchwork.ozlabs.org; Thu, 23 Dec 2010 06:00:56 -0500 Received: from [140.186.70.92] (port=48529 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PViec-0007BJ-9Z for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PViea-0003pM-Q3 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:13 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:36916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PViea-0003e9-Iu for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:12 -0500 Received: by mail-wy0-f173.google.com with SMTP id 36so6457648wyg.4 for ; Thu, 23 Dec 2010 02:44:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=f32t8zAi7+lbf5r5o4mHYQ0dBeuTy0FMY50ofyRayKQ=; b=w2Z8+/gE5GUv9zCN5f+yNuzYOnTzTHnKkJRCyB78itLot1W5Oc7WfB2YzCJp95YFQn CSmmV1laPGIRUqpxv8VBO9bfVi5F9sAKOD/VWraKZMc2Zw5DO3EbEryGjemFlr54e2VA EjLlYqcsstYvhkPs9h9N+/T3F38QmBSkYimBo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=As8Mzzx8Lg7FKA3vHg7FjXRZKSISuheyiZDF0ItS+vZtrg7eb8b+uKFhLfpzxUd4c1 nLO363YNtIps2qGR+2zPO+wB1eKEzTExzLsFgceGMYSEU4TaTM61KlndfibPUkQRY4uV yl0knWGWuVt3tjKmlRzQdZHA8JYbuRYJ4jTmc= Received: by 10.227.161.13 with SMTP id p13mr4919637wbx.164.1293101052100; Thu, 23 Dec 2010 02:44:12 -0800 (PST) Received: from localhost.localdomain (93-34-160-115.ip50.fastwebnet.it [93.34.160.115]) by mx.google.com with ESMTPS id m10sm5189008wbc.22.2010.12.23.02.44.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Dec 2010 02:44:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 23 Dec 2010 11:43:58 +0100 Message-Id: <1293101042-13121-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> References: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v3 11/15] move "ln -sf" emulation to a function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org "ln -sf" does not really do anything more than "ln -s" on Solaris. Signed-off-by: Paolo Bonzini --- configure | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 959bc97..a9c0219 100755 --- a/configure +++ b/configure @@ -32,6 +32,12 @@ compile_prog() { $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log 2>&1 } +# symbolically link $1 to $2. Portable version of "ln -sf". +symlink() { + rm -f $2 + ln -s $1 $2 +} + # check whether a command is available to this shell (may be either an # executable or a builtin) has() { @@ -2773,8 +2779,7 @@ fi for d in libdis libdis-user; do mkdir -p $d - rm -f $d/Makefile - ln -s $source_path/Makefile.dis $d/Makefile + symlink $source_path/Makefile.dis $d/Makefile echo > $d/config.mak done if test "$static" = "no" -a "$user_pie" = "yes" ; then @@ -2838,12 +2843,7 @@ mkdir -p $target_dir/ide if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then mkdir -p $target_dir/nwfpe fi - -# -# don't use ln -sf as not all "ln -sf" over write the file/link -# -rm -f $target_dir/Makefile -ln -s $source_path/Makefile.target $target_dir/Makefile +symlink $source_path/Makefile.target $target_dir/Makefile echo "# Automatically generated by configure - do not modify" > $config_target_mak @@ -3212,10 +3212,8 @@ if test "$source_path_used" = "yes" ; then for dir in $DIRS ; do mkdir -p $dir done - # remove the link and recreate it, as not all "ln -sf" overwrite the link for f in $FILES ; do - rm -f $f - ln -s $source_path/$f $f + symlink $source_path/$f $f done fi @@ -3237,15 +3235,13 @@ for hwlib in 32 64; do d=libhw$hwlib mkdir -p $d mkdir -p $d/ide - rm -f $d/Makefile - ln -s $source_path/Makefile.hw $d/Makefile + symlink $source_path/Makefile.hw $d/Makefile echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak done d=libuser mkdir -p $d -rm -f $d/Makefile -ln -s $source_path/Makefile.user $d/Makefile +symlink $source_path/Makefile.user $d/Makefile if test "$static" = "no" -a "$user_pie" = "yes" ; then echo "QEMU_CFLAGS+=-fpie" > $d/config.mak fi