From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9eB-0004DT-OS for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9e7-0006Pj-Ca for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:54 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9e4-00069k-1n for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:49 -0400 Received: by mail-wm1-x32c.google.com with SMTP id p21so185660wmc.0 for ; Mon, 29 Apr 2019 10:00:37 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.00.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:00:35 -0700 (PDT) From: Peter Maydell Date: Mon, 29 Apr 2019 17:59:51 +0100 Message-Id: <20190429170030.11323-4-peter.maydell@linaro.org> In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 03/42] configure: Remove --source-path option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Normally configure identifies the source path by looking at the location where the configure script itself exists. We also provide a --source-path option which lets the user manually override this. There isn't really an obvious use case for the --source-path option, and in commit 927128222b0a91f56c13a in 2017 we accidentally added some logic that looks at $source_path before the command line option that overrides it has been processed. The fact that nobody complained suggests that there isn't any use of this option and we aren't testing it either; remove it. This allows us to move the "make $source_path absolute" logic up so that there is no window in the script where $source_path is set but not yet absolute. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Message-id: 20190318134019.23729-1-peter.maydell@linaro.org --- configure | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e1ad87b697e..60719ddcc5b 100755 --- a/configure +++ b/configure @@ -278,6 +278,8 @@ ld_has() { # default parameters source_path=$(dirname "$0") +# make source path absolute +source_path=$(cd "$source_path"; pwd) cpu="" iasl="iasl" interp_prefix="/usr/gnemul/qemu-%M" @@ -520,8 +522,6 @@ for opt do ;; --cxx=*) CXX="$optarg" ;; - --source-path=*) source_path="$optarg" - ;; --cpu=*) cpu="$optarg" ;; --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg" @@ -600,9 +600,6 @@ if test "$debug_info" = "yes"; then LDFLAGS="-g $LDFLAGS" fi -# make source path absolute -source_path=$(cd "$source_path"; pwd) - # running configure in the source tree? # we know that's the case if configure is there. if test -f "./configure"; then @@ -946,8 +943,6 @@ for opt do ;; --interp-prefix=*) interp_prefix="$optarg" ;; - --source-path=*) - ;; --cross-prefix=*) ;; --cc=*) @@ -1651,7 +1646,6 @@ $(echo Available targets: $default_target_list | \ --target-list-exclude=LIST exclude a set of targets from the default target-list Advanced options (experts only): - --source-path=PATH path of source code [$source_path] --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix] --cc=CC use C compiler CC [$cc] --iasl=IASL use ACPI compiler IASL [$iasl] -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3999FC43219 for ; Mon, 29 Apr 2019 17:03:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F32B72147A for ; Mon, 29 Apr 2019 17:03:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="M1oafEc6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F32B72147A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:60617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9gU-00069T-5o for qemu-devel@archiver.kernel.org; Mon, 29 Apr 2019 13:03:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9eB-0004DT-OS for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9e7-0006Pj-Ca for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:54 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9e4-00069k-1n for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:00:49 -0400 Received: by mail-wm1-x32c.google.com with SMTP id p21so185660wmc.0 for ; Mon, 29 Apr 2019 10:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PFoqbSrULis9kg/uwP3G7dmLJHnNcJ2d0LVbku3wak0=; b=M1oafEc66+cbZX0lhDHyxemlXR488W9H6tO+1Ry1lBcgUJG4omAcb2BMwPzZ5IOLB+ kJj5CvIRn6dOyhDvkUnfTOXIVR1/sRnRM7Wc99rtdtY9dIBf88AWDN5XYGoXZqkoo3xL 25qeyuvI0fqGBcdFM9L101wP5juyl0bKcyggzPYe2AUiBCLNkhoTan3bJyQwb05hlFg9 BOowklwRBBFmMCoMGbTBW2QrvdxLj+eSgkbnPFDfBewjmsAtQHUqgC0QgvG5b5i7xiT7 vTpmJkMWe+hB5Ejke7/HdzC1qDfNyaWQS1gjKqFuCnpksKYPAYMrV3S4ZipyDbnDV/sa STvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PFoqbSrULis9kg/uwP3G7dmLJHnNcJ2d0LVbku3wak0=; b=cJ5tfMBHRIYXovDID9vLtIMgnaq9LNZV1CZ87DMK0cVLkYrOk5Pf9rxh2DBUzBRuRN qsjxIDg5F8SJvfKdE/j9PErv3k7PCHOJYPOHXIAFU+2PfRKwy3Wja2QX45eK8Vy+j9kx Lqmc1G1xwNrsAX4tWPfDENsoEGVdfuAIOdAg3x/Rb0/P0k2xOLhnnfJLDHVGvFt32tXH 6P1ZmqA2ZrQ5xZpGnzDk4mMEIqs3O/vCNpXMlz5DaemdWNQXsidLKzKUKl9rGEHx929Y fmF6hKSVwsdfPOX371ZmqN8zsD1kBiVAKgdgjR2teKobSF+02kJhT2EMoycRKilPZkTw BgIg== X-Gm-Message-State: APjAAAXqyevP2TkA+43rbChElPZs6+dTwaj2uc3O7o4DYLcrdtc4yQOg UXbfTtw53x83iRlxoeUpe3v2fG/HE4c= X-Google-Smtp-Source: APXvYqyvmQrzWSH82p3jcJGOcrEcGWMhKcexUnCdEDaRjQWHY5/x0rBwCvqOU4LAutfcQN2qjQHzAg== X-Received: by 2002:a7b:c762:: with SMTP id x2mr59439wmk.50.1556557236664; Mon, 29 Apr 2019 10:00:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.00.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:00:35 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 17:59:51 +0100 Message-Id: <20190429170030.11323-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PULL 03/42] configure: Remove --source-path option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190429165951.k4Q4Nkgm874ZAy-iPnsqpE9Ygs0if8P_uJJsVY4P2L4@z> Normally configure identifies the source path by looking at the location where the configure script itself exists. We also provide a --source-path option which lets the user manually override this. There isn't really an obvious use case for the --source-path option, and in commit 927128222b0a91f56c13a in 2017 we accidentally added some logic that looks at $source_path before the command line option that overrides it has been processed. The fact that nobody complained suggests that there isn't any use of this option and we aren't testing it either; remove it. This allows us to move the "make $source_path absolute" logic up so that there is no window in the script where $source_path is set but not yet absolute. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Message-id: 20190318134019.23729-1-peter.maydell@linaro.org --- configure | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e1ad87b697e..60719ddcc5b 100755 --- a/configure +++ b/configure @@ -278,6 +278,8 @@ ld_has() { # default parameters source_path=$(dirname "$0") +# make source path absolute +source_path=$(cd "$source_path"; pwd) cpu="" iasl="iasl" interp_prefix="/usr/gnemul/qemu-%M" @@ -520,8 +522,6 @@ for opt do ;; --cxx=*) CXX="$optarg" ;; - --source-path=*) source_path="$optarg" - ;; --cpu=*) cpu="$optarg" ;; --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg" @@ -600,9 +600,6 @@ if test "$debug_info" = "yes"; then LDFLAGS="-g $LDFLAGS" fi -# make source path absolute -source_path=$(cd "$source_path"; pwd) - # running configure in the source tree? # we know that's the case if configure is there. if test -f "./configure"; then @@ -946,8 +943,6 @@ for opt do ;; --interp-prefix=*) interp_prefix="$optarg" ;; - --source-path=*) - ;; --cross-prefix=*) ;; --cc=*) @@ -1651,7 +1646,6 @@ $(echo Available targets: $default_target_list | \ --target-list-exclude=LIST exclude a set of targets from the default target-list Advanced options (experts only): - --source-path=PATH path of source code [$source_path] --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix] --cc=CC use C compiler CC [$cc] --iasl=IASL use ACPI compiler IASL [$iasl] -- 2.20.1