From nobody Thu Nov 6 12:33:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154115977039797.08772296383427; Fri, 2 Nov 2018 04:56:10 -0700 (PDT) Received: from localhost ([::1]:50950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY3Y-0001m6-Pl for importer@patchew.org; Fri, 02 Nov 2018 07:56:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY0Q-0007V2-UU for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIY0P-0004IA-Ou for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:50 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIY0P-0004HS-GL for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:49 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gIY0M-0003Lz-GY; Fri, 02 Nov 2018 11:52:46 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 11:52:38 +0000 Message-Id: <20181102115239.22485-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102115239.22485-1-peter.maydell@linaro.org> References: <20181102115239.22485-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2 for-3.1 3/4] configure: Rename FILES variable to LINKS 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: , Cc: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The FILES variable is used to accumulate a list of things to symlink from the source tree into the build tree. These don't have to be individual files; symlinking an entire directory of data files is also fine. Rename it to something less confusing before we add a few directories to it. Improve the comment to clarify what DIRS and LINKS do and why it's not a good idea to add things to LINKS with wildcarding. Signed-off-by: Peter Maydell --- configure | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/configure b/configure index bfdca8b814e..52408ed3076 100755 --- a/configure +++ b/configure @@ -7392,22 +7392,31 @@ if test "$ccache_cpp2" =3D "yes"; then echo "export CCACHE_CPP2=3Dy" >> $config_host_mak fi =20 -# build tree in object directory in case the source is not in the current = directory +# If we're using a separate build tree, set it up now. +# DIRS are directories which we simply mkdir in the build tree; +# 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. DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/q= api-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" DIRS=3D"$DIRS tests/fp" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" -FILES=3D"Makefile tests/tcg/Makefile qdict-test-data.txt" -FILES=3D"$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES=3D"$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makef= ile" -FILES=3D"$FILES tests/fp/Makefile" -FILES=3D"$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" -FILES=3D"$FILES pc-bios/spapr-rtas/Makefile" -FILES=3D"$FILES pc-bios/s390-ccw/Makefile" -FILES=3D"$FILES roms/seabios/Makefile roms/vgabios/Makefile" -FILES=3D"$FILES pc-bios/qemu-icon.bmp" -FILES=3D"$FILES .gdbinit scripts" # scripts needed by relative path in .gd= binit +LINKS=3D"Makefile tests/tcg/Makefile qdict-test-data.txt" +LINKS=3D"$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" +LINKS=3D"$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makef= ile" +LINKS=3D"$LINKS tests/fp/Makefile" +LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS=3D"$LINKS pc-bios/spapr-rtas/Makefile" +LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" +LINKS=3D"$LINKS roms/seabios/Makefile roms/vgabios/Makefile" +LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" +LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ @@ -7419,10 +7428,10 @@ for bios_file in \ $source_path/pc-bios/u-boot.* \ $source_path/pc-bios/palcode-* do - FILES=3D"$FILES pc-bios/$(basename $bios_file)" + LINKS=3D"$LINKS pc-bios/$(basename $bios_file)" done mkdir -p $DIRS -for f in $FILES ; do +for f in $LINKS ; do if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" !=3D "y" ]; then symlink "$source_path/$f" "$f" fi --=20 2.19.1