From patchwork Sun Nov 14 11:48:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 71109 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 DB755B7119 for ; Sun, 14 Nov 2010 23:08:42 +1100 (EST) Received: from localhost ([127.0.0.1]:45112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHbNw-0001lO-9J for incoming@patchwork.ozlabs.org; Sun, 14 Nov 2010 07:08:40 -0500 Received: from [140.186.70.92] (port=43598 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHb5a-00033M-Ou for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHb5Y-0004Ia-N3 for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:42 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:44131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHb5Y-0004Eg-HR for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:40 -0500 Received: by mail-pz0-f45.google.com with SMTP id 6so976259pzk.4 for ; Sun, 14 Nov 2010 03:49:40 -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=Yh/A6so6UAeeGOSSXb0m/HJy4lPmDGpUDx8MTRqwygY=; b=hS/XTJ4DWRkE4pC+1niyYGVOsE3sZj8pDc1t5SZwjiZnQAGnKVDON+q5VkQWf/Zoxc GY0i45WNq5tbnNMcc3YpBN2nQVCMyshntaW+5VFZfYPepH4+Zz8P3vd9BB4ABRnfvC8E GIjG3Bkc9zCxnWVZW8g16OR587g2JAvb9xoCY= 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=hC17V2ZtR3rXZu+/6M1lTdxs+xvS1BuyqkE93uSq2Pmu6pEnFX01YoRVZWxKhWdOHq CK0JSENoq8L0ww87I9JAbLXiXpmp+UpeUENq4WFE+rcuXcHzfV4eEZOkLphxwFKx1eMR HXK0h18+6rLakNKyCqk3bYUXadEHdWODg9row= Received: by 10.142.217.13 with SMTP id p13mr4042643wfg.125.1289735380142; Sun, 14 Nov 2010 03:49:40 -0800 (PST) Received: from localhost.localdomain (s209p8.home.99maxprogres.cz [85.93.118.17]) by mx.google.com with ESMTPS id x35sm7086810wfd.13.2010.11.14.03.49.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 03:49:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 14 Nov 2010 12:48:59 +0100 Message-Id: <1289735342-8660-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1289735342-8660-1-git-send-email-pbonzini@redhat.com> References: <1289735342-8660-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 11/14] assume existence of "ln -sf" 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 The code in this patch was introduced for a Solaris port, but ln -sf exists in Solaris 2.6 at least. Signed-off-by: Paolo Bonzini --- configure | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 2d2d306..5a3b127 100755 --- a/configure +++ b/configure @@ -2676,8 +2676,7 @@ fi for d in libdis libdis-user; do mkdir -p $d - rm -f $d/Makefile - ln -s $source_path/Makefile.dis $d/Makefile + ln -sf $source_path/Makefile.dis $d/Makefile echo > $d/config.mak done if test "$static" = "no" -a "$user_pie" = "yes" ; then @@ -2741,12 +2740,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 +ln -sf $source_path/Makefile.target $target_dir/Makefile echo "# Automatically generated by configure - do not modify" > $config_target_mak @@ -3115,10 +3109,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 + test -f $f || ln -sf $source_path/$f $f done fi @@ -3140,15 +3132,14 @@ 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 + ln -sf $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 +ln -sf $source_path/Makefile.user $d/Makefile if test "$static" = "no" -a "$user_pie" = "yes" ; then echo "QEMU_CFLAGS+=-fpie" > $d/config.mak fi