From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH v4 01/12] configure: fixes dtc not cloned when running msys2 CI
Date: Thu, 3 Sep 2020 16:31:36 +0800 [thread overview]
Message-ID: <20200903083147.707-2-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200903083147.707-1-luoyonggang@gmail.com>
Symlink dtc after git submodule update, because on win32 symlink to non-exist folder are forbidden.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
configure | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 8a3acef89d..30f8c4db29 100755
--- a/configure
+++ b/configure
@@ -2053,9 +2053,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)
@@ -4261,9 +4258,6 @@ EOF
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
fdt=git
mkdir -p dtc
- if [ "$pwd_is_source_path" != "y" ] ; then
- symlink "$source_path/dtc/Makefile" "dtc/Makefile"
- fi
fdt_cflags="-I${source_path}/dtc/libfdt"
fdt_ldflags="-L$PWD/dtc/libfdt"
fdt_libs="$fdt_libs"
@@ -6593,6 +6587,16 @@ 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")
+
+ if test "$fdt" = "git" ; then
+ if [ "$pwd_is_source_path" != "y" ] ; then
+ symlink "$source_path/dtc/Makefile" "dtc/Makefile"
+ fi
+ fi
+fi
+
# Check that the C++ compiler exists and works with the C compiler.
# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.
if has $cxx; then
--
2.28.0.windows.1
next prev parent reply other threads:[~2020-09-03 8:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:31 [PATCH v4 00/12] Green the msys2 CI make Yonggang Luo
2020-09-03 8:31 ` Yonggang Luo [this message]
2020-09-03 8:31 ` [PATCH v4 02/12] meson: Convert undefsym.sh to undefsym.py Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 03/12] tcg: Fixes dup_const link error Yonggang Luo
2020-09-03 17:20 ` Richard Henderson
2020-09-03 21:19 ` 罗勇刚(Yonggang Luo)
2020-09-03 23:29 ` Richard Henderson
2020-09-03 8:31 ` [PATCH v4 04/12] tests: handling signal on win32 properly Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 05/12] configure: Fix include and linkage issue on msys2 Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 06/12] block: Fixes nfs on msys2/mingw Yonggang Luo
2020-09-03 14:40 ` Thomas Huth
2020-09-03 8:31 ` [PATCH v4 07/12] osdep: These function are only available on Non-Win32 system Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 08/12] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 09/12] stubs: qemu_notify_event have no need to stub Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 10/12] meson: Fixes qapi tests Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 11/12] tests: Disable test-image-locking that not works under Win32 Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 12/12] ci: Enable msys2 ci in cirrus Yonggang Luo
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=20200903083147.707-2-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=pbonzini@redhat.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).