From patchwork Wed Jun 1 18:05:27 2022 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: 577834 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp871489mab; Wed, 1 Jun 2022 11:45:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5TKLV2YpDM6e96/msnB7ztxxiHTMv6pkOhATlP4097pNt1vT5wGmqaZvmXlQ61dmr/JFv X-Received: by 2002:a05:620a:40cb:b0:6a0:922b:2d67 with SMTP id g11-20020a05620a40cb00b006a0922b2d67mr1008892qko.20.1654109159443; Wed, 01 Jun 2022 11:45:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654109159; cv=none; d=google.com; s=arc-20160816; b=WzCz26c3BYZVWi3l83x0TWhkExyJAMdBHCeMv5w0I7sBdVYyCTeXaPwFDuQlx/VPEU Tk69IezQhXfw69tbycvQKnVGvyIHQ/oA0XD9MSAgST/8lIuJKVaMK1K3F24CXUgkrOWE vropsIjyopyMOE5Q+hZ1Q4482lVTM8XqizfCcwsC9jMxS5yflb5NWH1I0g6oclhlMtT+ 9AAs7afBTYkCIU6o0p3D+cBI+daw2qAOXnnTvSCoN2jET37a1zQjIFYc08YkYV870JFJ 1N86XjTFpw2XxbB1LoY0EfxR2k2xpesCRWMvLBTMCgfPgE2Go7rZVNco9871BOr5ReqS OS9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=KeZFB49f0HG2oaQnmmJJDJ7RJAOQdzdauiYvPp+HDIc2gzRQBvz/8N/QMTJ2Eokch0 uhbmxZOhVQ111c8nJpd+g2TQjy4rupVEg6m1rWkQxQr/vIWGkuGkik5c8OvIc+mTpsMC jTvikKVgseA9CTnATg32MbVux3LNTc5Zvhv1B9hXEIy/Djk8b37MkQ8TWt3KbljpU6gD svLuas02ODODcAmW9X2R3nq5/xwHulfkXttU8KV+QfvTQmfv1tyOC+0rdXgYi7oGsqIq 7ucp/edn+Fdg+Bjazyb1jGJcId22VaGU7ruE25PKKW2zaz0WieOI/EOx7WFK/G8U8t4M cQ4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ry9IwEci; 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=pass (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 r77-20020a374450000000b0069f8abb5c2csi1341002qka.360.2022.06.01.11.45.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:45:59 -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=pass header.i=@linaro.org header.s=google header.b=Ry9IwEci; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTLy-0004TF-VZ for patch@linaro.org; Wed, 01 Jun 2022 14:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwT0k-0005fK-RL for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:03 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:36479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwT0j-0007uz-0z for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:02 -0400 Received: by mail-ed1-x52c.google.com with SMTP id fd25so3342440edb.3 for ; Wed, 01 Jun 2022 11:24:00 -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=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=Ry9IwEci1BH58bNoqJ/AJg4HC86bwCOnYkf4y1tlIVjV5PNW0uCcOvhw45F27NSFkz 23PKwzsMFk0Rf0mx6qPQAUPxn0Sepgn2MlHcXowF3qSF/UQVgJGSTQcOWwd8hAkI00jb 8rqvEYUI6TL5vQYhCtocpzapzdarDvApKMeI7ufL0VVvrP3eW9NzHJeB0icR2qh/nhA/ my3jA3zdmFecoFc0MxqGUo/mDvOL98Msp4STHg+DuL4oi1dctNm4y2yRkfmAmeZAwTlP iDnCua2y2v9PAu44xkhCDwlkyMG/QnY8exfKEhLvHX/0V2aocvnnVLRQQlMpe0J7vys4 QrHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=yR9hcL86Pl8+wQhBXQZ+EH3hGD05g6O22yehLMDFQT/kVjyJd/xflVMyiV6zb06+zD +i3H6VJkrpkhjNuabO7lx8c8Qn/sxlmBO1tlGbHSbBbaPNeY2znzFRptWTkH4vrwqdmg pdMmf8mi5jzJ1xgWRT0Cl18zj9/aNgdPkO+yCZ+8v/yZKPgHFD/SSp9At8jVB46bol/R vkrwxYUj80kpI7XlzKqs8YOp9jYtwzHLuwC3JgwELCv3zO8zt1ld7wuYsEHzbl02Ygb6 U2VsnC2I4tqGTgWiQO7PXsJunr7UBB1PLoJxO0lFe2d9pPx2eoA/eDDJZ/zMjiz/O1q2 6F0A== X-Gm-Message-State: AOAM533Q6bJyHXuJZ7UMEpFTdbYt7QiqjgDvzvIF942MR8I+KhD8wKM9 m0ZJr27SHQfbjW5KaogoWEi/PQ== X-Received: by 2002:a05:6402:40d4:b0:42b:3203:aafe with SMTP id z20-20020a05640240d400b0042b3203aafemr1117280edb.376.1654107838965; Wed, 01 Jun 2022 11:23:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f24-20020a05640214d800b0042617ba63basm1341619edx.68.2022.06.01.11.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:23:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C0B891FFCE; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 23/33] configure: move symlink configuration earlier Date: Wed, 1 Jun 2022 19:05:27 +0100 Message-Id: <20220601180537.2329566-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory exist at the time when we'll write out the compiler configuration for them. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-13-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-24-alex.bennee@linaro.org> diff --git a/configure b/configure index ced8283b98..aa17b0fa55 100755 --- a/configure +++ b/configure @@ -2190,6 +2190,30 @@ if test "$QEMU_GA_VERSION" = ""; then QEMU_GA_VERSION=$(cat $source_path/VERSION) fi +# Set up build tree symlinks that point back into the source tree +# (these can be both files and directories). +# Caution: avoid adding files or directories here using wildcards. This +# will result in problems later if a new file matching the wildcard is +# added to the source tree -- nothing will cause configure to be rerun +# so the build tree will be missing the link back to the new file, and +# tests might fail. Prefer to keep the relevant files in their own +# directory and symlink the directory instead. +LINKS="Makefile" +LINKS="$LINKS tests/tcg/Makefile.target" +LINKS="$LINKS pc-bios/optionrom/Makefile" +LINKS="$LINKS pc-bios/s390-ccw/Makefile" +LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit +LINKS="$LINKS tests/avocado tests/data" +LINKS="$LINKS tests/qemu-iotests/check" +LINKS="$LINKS python" +LINKS="$LINKS contrib/plugins/Makefile " +for f in $LINKS ; do + if [ -e "$source_path/$f" ]; then + mkdir -p `dirname ./$f` + symlink "$source_path/$f" "$f" + fi +done + # Mac OS X ships with a broken assembler roms= if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ @@ -2408,31 +2432,6 @@ if test "$safe_stack" = "yes"; then echo "CONFIG_SAFESTACK=y" >> $config_host_mak fi -# If we're using a separate build tree, set it up now. -# LINKS are things to symlink back into the source tree -# (these can be both files and directories). -# Caution: do not add files or directories here using wildcards. This -# will result in problems later if a new file matching the wildcard is -# added to the source tree -- nothing will cause configure to be rerun -# so the build tree will be missing the link back to the new file, and -# tests might fail. Prefer to keep the relevant files in their own -# directory and symlink the directory instead. -LINKS="Makefile" -LINKS="$LINKS tests/tcg/Makefile.target" -LINKS="$LINKS pc-bios/optionrom/Makefile" -LINKS="$LINKS pc-bios/s390-ccw/Makefile" -LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit -LINKS="$LINKS tests/avocado tests/data" -LINKS="$LINKS tests/qemu-iotests/check" -LINKS="$LINKS python" -LINKS="$LINKS contrib/plugins/Makefile " -for f in $LINKS ; do - if [ -e "$source_path/$f" ]; then - mkdir -p `dirname ./$f` - symlink "$source_path/$f" "$f" - fi -done - # tests/tcg configuration (makefile=tests/tcg/Makefile.prereqs echo "# Automatically generated by configure - do not modify" > $makefile