From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Yonggang Luo <luoyonggang@gmail.com>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH 1/6] configure: fixes dtc not cloned when running msys2 CI
Date: Wed, 2 Sep 2020 19:32:08 +0200 [thread overview]
Message-ID: <1000842f-3f7e-fa77-e9ce-5cc242ac44bb@redhat.com> (raw)
In-Reply-To: <20200902170054.810-2-luoyonggang@gmail.com>
On 9/2/20 7:00 PM, Yonggang Luo wrote:
> 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
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2020-09-02 17:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 17:00 [PATCH 0/6] Green the msys2 CI make Yonggang Luo
2020-09-02 17:00 ` [PATCH 1/6] configure: fixes dtc not cloned when running msys2 CI Yonggang Luo
2020-09-02 17:32 ` Philippe Mathieu-Daudé [this message]
2020-09-02 17:00 ` [PATCH 2/6] meson: Convert undefsym.sh to undefsym.py Yonggang Luo
2020-09-02 17:00 ` [PATCH 3/6] ci: Install msys2 in a proper way refer to https://github.com/cirruslabs/cirrus-ci-docs/issues/699 Enable msys2 ci in cirrus Yonggang Luo
2020-09-02 17:30 ` Philippe Mathieu-Daudé
2020-09-02 17:42 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:31 ` Philippe Mathieu-Daudé
2020-09-02 19:32 ` 罗勇刚(Yonggang Luo)
2020-09-02 17:50 ` 罗勇刚(Yonggang Luo)
2020-09-02 18:54 ` Mark Cave-Ayland
2020-09-02 18:56 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:00 ` Mark Cave-Ayland
2020-09-02 19:01 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:13 ` Mark Cave-Ayland
2020-09-02 19:15 ` 罗勇刚(Yonggang Luo)
2020-09-02 18:50 ` Mark Cave-Ayland
2020-09-02 17:00 ` [PATCH 4/6] tcg: Fixes dup_const link error Yonggang Luo
2020-09-02 17:16 ` Richard Henderson
2020-09-02 17:17 ` 罗勇刚(Yonggang Luo)
2020-09-02 17:21 ` Richard Henderson
2020-09-02 17:00 ` [PATCH 5/6] tests: handling signal on win32 properly Yonggang Luo
2020-09-02 17:04 ` Paolo Bonzini
2020-09-02 17:09 ` 罗勇刚(Yonggang Luo)
2020-09-03 5:58 ` Thomas Huth
2020-09-03 7:00 ` Paolo Bonzini
2020-09-02 17:00 ` [PATCH 6/6] configure: Fix include and linkage issue on msys2 Yonggang Luo
2020-09-02 17:05 ` Paolo Bonzini
2020-09-02 17:06 ` 罗勇刚(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=1000842f-3f7e-fa77-e9ce-5cc242ac44bb@redhat.com \
--to=philmd@redhat.com \
--cc=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).