From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Yonggang Luo <luoyonggang@gmail.com>
Subject: [PULL 41/46] configure: update dtc submodule
Date: Fri, 4 Sep 2020 07:41:17 -0400 [thread overview]
Message-ID: <20200904114122.31307-42-pbonzini@redhat.com> (raw)
In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com>
From: Yonggang Luo <luoyonggang@gmail.com>
Update the dtc submodule in configure already and symlink dtc after
git submodule update, because on win32 symlinks to non-existing folders
are forbidden.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200902170054.810-2-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 8e749ae38a..c71bceb8e8 100755
--- a/configure
+++ b/configure
@@ -1984,9 +1984,6 @@ fi
if test "$meson" = git; then
git_submodules="${git_submodules} meson"
fi
-if test "$git_update" = yes; then
- (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update "$git_submodules")
-fi
case "$meson" in
git | internal)
@@ -4165,7 +4162,6 @@ EOF
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
fdt=git
mkdir -p dtc
- symlink "$source_path/dtc/Makefile" "dtc/Makefile"
fdt_cflags="-I${source_path}/dtc/libfdt"
fdt_ldflags="-Ldtc/libfdt"
fdt_libs="$fdt_libs"
@@ -6445,6 +6441,13 @@ if test "$cpu" = "s390x" ; then
fi
fi
+if test $git_update = 'yes' ; then
+ (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update "$git_submodules")
+fi
+if test "$fdt" = "git" ; then
+ symlink "$source_path/dtc/Makefile" "dtc/Makefile"
+fi
+
config_host_mak="config-host.mak"
echo "# Automatically generated by configure - do not modify" > $config_host_mak
--
2.26.2
next prev parent reply other threads:[~2020-09-04 12:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 11:40 [PULL 00/46] Next round of Meson bugfixes and cleanups Paolo Bonzini
2020-09-04 11:40 ` [PULL 01/46] qemu-iotests: move check-block back to Makefiles Paolo Bonzini
2020-09-04 11:40 ` [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX Paolo Bonzini
2020-09-04 11:40 ` [PULL 03/46] tests: handling signal on win32 properly Paolo Bonzini
2020-09-04 11:40 ` [PULL 04/46] mtest2make: split environment from test command Paolo Bonzini
2020-09-04 11:40 ` [PULL 05/46] mtest2make: split working directory " Paolo Bonzini
2020-09-04 11:40 ` [PULL 06/46] mtest2make: hide output of successful tests Paolo Bonzini
2020-09-04 11:40 ` [PULL 07/46] mtest2make: unify tests that appear in multiple suites Paolo Bonzini
2020-09-04 11:40 ` [PULL 08/46] meson: remove b_lundef option Paolo Bonzini
2020-09-04 11:40 ` [PULL 09/46] configure: do not include absolute paths in -I and -L paths Paolo Bonzini
2020-09-04 11:40 ` [PULL 10/46] configure: include cross sdl2-config in meson cross file Paolo Bonzini
2020-09-04 11:40 ` [PULL 11/46] ninjatool: use constant names for stamp files Paolo Bonzini
2020-09-04 11:40 ` [PULL 12/46] meson: fix libqos linking Paolo Bonzini
2020-09-04 11:40 ` [PULL 13/46] meson: build qapi tests library Paolo Bonzini
2020-09-04 11:40 ` [PULL 14/46] meson: declare tasn1 dependency Paolo Bonzini
2020-09-04 11:40 ` [PULL 15/46] meson: declare keyutils dependency Paolo Bonzini
2020-09-04 11:40 ` [PULL 16/46] meson: convert qht-bench Paolo Bonzini
2020-09-04 11:40 ` [PULL 17/46] meson: convert the unit tests Paolo Bonzini
2020-09-04 11:40 ` [PULL 18/46] meson: move keyutils dependency check Paolo Bonzini
2020-09-04 11:40 ` [PULL 19/46] meson: remove old socket_scm_helper rule Paolo Bonzini
2020-09-04 11:40 ` [PULL 20/46] meson: convert vhost-user-bridge Paolo Bonzini
2020-09-04 11:40 ` [PULL 21/46] meson: convert atomic*-bench Paolo Bonzini
2020-09-04 11:40 ` [PULL 22/46] tests: do not print benchmark output to stdout Paolo Bonzini
2020-09-04 11:40 ` [PULL 23/46] meson: convert the speed tests Paolo Bonzini
2020-09-04 11:41 ` [PULL 24/46] tests/migration/stress: remove unused exit_success Paolo Bonzini
2020-09-04 11:41 ` [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30 Paolo Bonzini
2020-09-04 11:41 ` [PULL 26/46] meson: convert migration/initrd-stress Paolo Bonzini
2020-09-04 11:41 ` [PULL 27/46] configure: remove dead code for in-tree builds Paolo Bonzini
2020-09-04 11:41 ` [PULL 28/46] meson: compute config_all_devices directly Paolo Bonzini
2020-09-04 11:41 ` [PULL 29/46] Makefile: remove dead variables and includes Paolo Bonzini
2020-09-04 11:41 ` [PULL 30/46] Makefile: inline the relevant parts of rules.mak Paolo Bonzini
2020-09-04 11:41 ` [PULL 31/46] configure: move disassembler configuration to meson Paolo Bonzini
2020-09-04 11:41 ` [PULL 32/46] configure: move C++ compiler handling " Paolo Bonzini
2020-09-04 11:41 ` [PULL 33/46] meson: keep all compiler flags detection together Paolo Bonzini
2020-09-04 11:41 ` [PULL 34/46] configure: move -ldl test to meson Paolo Bonzini
2020-09-04 11:41 ` [PULL 35/46] configure: remove unnecessary libm test Paolo Bonzini
2020-09-04 11:41 ` [PULL 36/46] configure: do not look for install(1) Paolo Bonzini
2020-09-04 11:41 ` [PULL 37/46] meson: get glib compilation flags from GLIB_CFLAGS Paolo Bonzini
2020-09-04 11:41 ` [PULL 38/46] configure: do not include dependency flags in QEMU_CFLAGS and LIBS Paolo Bonzini
2020-09-04 11:41 ` [PULL 39/46] configure: drop dead variables and functions Paolo Bonzini
2020-09-04 11:41 ` [PULL 40/46] docs: suggest Meson replacements for various configure functions Paolo Bonzini
2020-09-04 11:41 ` Paolo Bonzini [this message]
2020-09-04 11:41 ` [PULL 42/46] oss-fuzz: fix rpath Paolo Bonzini
2020-09-04 11:41 ` [PULL 43/46] meson: specify fuzz linker script as a project arg Paolo Bonzini
2020-09-04 11:41 ` [PULL 44/46] fuzz: Add support for custom fuzzing library Paolo Bonzini
2020-09-04 11:41 ` [PULL 45/46] meson: Convert undefsym.sh to undefsym.py Paolo Bonzini
2020-09-04 11:41 ` [PULL 46/46] meson: remove linkage of sdl to baum Paolo Bonzini
2020-09-06 15:23 ` [PULL 00/46] Next round of Meson bugfixes and cleanups Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200904114122.31307-42-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).