Re: [PATCH 1/6] configure: fixes dtc not cloned when running msys2 CI

[Philippe Mathieu-Daudé]

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>