From patchwork Mon Jul 13 20:04:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 235485 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3136513ilg; Mon, 13 Jul 2020 13:04:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaD/SX0qRING9go5t35nluApOnYLcPWfS7062/zqFsHuzlgCmeytIj7F+RPhfww40BTIYc X-Received: by 2002:a25:f20d:: with SMTP id i13mr2610404ybe.366.1594670678542; Mon, 13 Jul 2020 13:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594670678; cv=none; d=google.com; s=arc-20160816; b=T6uVyqt7BtwTL+Zx8Rt0VlkhBPqAU3sm05wfSUX5+7vF6+lrb1/vmD2NmUO0Cq1wWN dMaKM+J/f3m8K2HcjFKfnOPTKp971bsujmHHr8eZW2Tr6Gapg8ToCrNaCGYBEx6hGHnn FfErtfXmX3MJoiZq9irput33RwDFR9dnn/ZUrbia9p63xVzaOrjJgp384vvEYfe3vSwb TSeS8TlzF0EAPc83o4NSSKnpgQCFNdUPmsKYvv/iqKlTOcjJy8MENj/JKOgz2hxUCQIU hBqkcq8eRgxmH1A/QNUc4LNDTZtpyQ9Hl3LkRik3Ogou+wILTAeXwNjsoAzjI4RMP9mX dlsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=0GDUfAsY7oBRDehZI0s+LxQK3zPfLdSNXvvRvB9ltNY=; b=hrlX7QVwlSISRt05atByMDCeOTShy4HOOKXCMeAnv880Wr0n0SLss8MJgAf9KtrG8C VMiHtS7jvz9fEsY9CmMHw38na3v+7vwS5CqG8tQEWrUl9X40No64weH0JcRywfoQZRG6 jUMu6v2jmqEY6I3vpD+MoPbuFRkF+2vQpBfu25rW21I0IFbUQ8xv7EKdAA6vYcogFH5L vHCvv69P+OhkAowpfqpd57OAfuxL4bXnPEBY7Eolw4NOIgKBoJgXNj+ma3xtnBmpPVM3 eaiA94+UzNukV0AqdoX/ErVrSp8inh+Y5y4GeTJrfH/hGMJuh/IZMtNraOa+GEP4z2kj rYLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yw5nL6g3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p16si15029663yba.199.2020.07.13.13.04.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 13:04:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yw5nL6g3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv4go-00080z-0M for patch@linaro.org; Mon, 13 Jul 2020 16:04:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv4ga-0007wO-JI for qemu-devel@nongnu.org; Mon, 13 Jul 2020 16:04:24 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jv4gY-0006GW-Pk for qemu-devel@nongnu.org; Mon, 13 Jul 2020 16:04:24 -0400 Received: by mail-wm1-x343.google.com with SMTP id o8so1127115wmh.4 for ; Mon, 13 Jul 2020 13:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0GDUfAsY7oBRDehZI0s+LxQK3zPfLdSNXvvRvB9ltNY=; b=yw5nL6g3+qlDT1vGZe3O7nVEHuN/ORByMYZCWmIxWlV5hRsbZdkpgasJF+EHpfT/U3 eFZ7fOM3c+cQMGQly6hlnOL41wG9Zh3u5LH/e5PqJma5RxhBuq5UClbPl8Rpxuu9akMO miavOMoDFULXNlHf+y35Msxy7oQQt2WtMDyArCW6l1e8bm8dUSvw26pXFOc6B53slPZd dcr5c4jytxONTFdDd4y+TVWWpJi66HcBXgwIddm7K5yqEBxv4I+xuH8I1kIMOrJb49ud 75+cQJ+vr6iXyeqiwU64stFveQ8q5rKK5hiM6caYy2gos9lhmblwS3EXJyZvh8U2U0av UcFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0GDUfAsY7oBRDehZI0s+LxQK3zPfLdSNXvvRvB9ltNY=; b=RFP8FwTG2AE1cKdt67caE8lgOFYD1Ko5qu/AUuNNhrRJ2oVP860sFVGDWvwvinzXGn dZzGO5+oYU6ZqWhHqAy6iHwg9SdFf5ixGv18mNqLQNJ2d8udYLqnAkWHb/oBrmWmN8aH NfyJzUHBI5ZHLlHN306cgCcEVy2fZODIBmFHx0bgEIAtgO8YUFtxN88KCgWj91EHQDQe XypsqoL9t5JkAODCL/y2C10DhexVgadXopAme1qAiVZkCQ+kiWcB3P32rxSgaBUPr7zk nGF9Ocp1qWYFZhduFi/9TXTRW1hOHktnlPYd4cmJXgi8/yxpHOQu0fdhghaJnmCD23aO pq1Q== X-Gm-Message-State: AOAM533SEIOeXlUzjvQCiULA+YoLCe3Hm01RuvXUp1d+rb5GayHFQ6j0 KDiy1vc8SFHwlkFwxuzcqctsUQ== X-Received: by 2002:a1c:e18a:: with SMTP id y132mr1017817wmg.27.1594670661440; Mon, 13 Jul 2020 13:04:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 133sm1010756wme.5.2020.07.13.13.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 13:04:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD1E61FF87; Mon, 13 Jul 2020 21:04:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/11] configure: remove all dependencies on a (re)configure Date: Mon, 13 Jul 2020 21:04:05 +0100 Message-Id: <20200713200415.26214-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713200415.26214-1-alex.bennee@linaro.org> References: <20200713200415.26214-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, robert.foley@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, cota@braap.org, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The previous code was brittle and missed cases such as the mipn32 variants which for some reason has the 64 bit syscalls. This leads to a number of binary targets having deps lines like: all.clang-sanitizer/mipsn32el-linux-user/linux-user/signal.d 140: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \ 455:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h: all.clang-sanitizer/mipsn32el-linux-user/linux-user/syscall.d 146: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \ 485:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h: which in turn would trigger the re-generation of syscall_nr.h in the source tree (thanks to generic %/syscall_nr.h rules). The previous code attempts to clean it out but misses edge cases but fails. After spending a day trying to understand how this was happening I'm unconvinced that there are not other such breakages possible with this "caching". As we add more auto-generated code to the build it is likely to trip up again. Apply a hammer to the problem. Fixes: 91e5998f18 (which fixes 5f29856b852d and 4d6a835dea47) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/configure b/configure index bc3b9ad931..e1de2f5b24 100755 --- a/configure +++ b/configure @@ -1955,23 +1955,20 @@ EOF exit 0 fi -# Remove old dependency files to make sure that they get properly regenerated -rm -f */config-devices.mak.d - # Remove syscall_nr.h to be sure they will be regenerated in the build # directory, not in the source directory for arch in alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc sparc64 \ i386 x86_64 mips mips64 ; do # remove the file if it has been generated in the source directory rm -f "${source_path}/linux-user/${arch}/syscall_nr.h" - # remove the dependency files - for target in ${arch}*-linux-user ; do - test -d "${target}" && find "${target}" -type f -name "*.d" \ - -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {} \; \ - -print | while read file ; do rm "${file}" "${file%.d}.o" ; done - done done +# Clean out all old dependency files. As more files are generated we +# run the risk of old dependencies triggering generation in the wrong +# places. Previous brittle attempts to be surgical tend to miss edge +# cases leading to wasted time and much confusion. +find -type f -name "*.d" -exec rm -f {} \; + if test -z "$python" then error_exit "Python not found. Use --python=/path/to/python"