[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/46] configure: update dtc submodule
From: |
Paolo Bonzini |
Subject: |
[PULL 41/46] configure: update dtc submodule |
Date: |
Fri, 4 Sep 2020 07:41:17 -0400 |
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
- [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30, (continued)
- [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30, Paolo Bonzini, 2020/09/04
- [PULL 26/46] meson: convert migration/initrd-stress, Paolo Bonzini, 2020/09/04
- [PULL 27/46] configure: remove dead code for in-tree builds, Paolo Bonzini, 2020/09/04
- [PULL 28/46] meson: compute config_all_devices directly, Paolo Bonzini, 2020/09/04
- [PULL 29/46] Makefile: remove dead variables and includes, Paolo Bonzini, 2020/09/04
- [PULL 31/46] configure: move disassembler configuration to meson, Paolo Bonzini, 2020/09/04
- [PULL 32/46] configure: move C++ compiler handling to meson, Paolo Bonzini, 2020/09/04
- [PULL 33/46] meson: keep all compiler flags detection together, Paolo Bonzini, 2020/09/04
- [PULL 35/46] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/04
- [PULL 40/46] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/04
- [PULL 41/46] configure: update dtc submodule,
Paolo Bonzini <=
- [PULL 34/46] configure: move -ldl test to meson, Paolo Bonzini, 2020/09/04
- [PULL 37/46] meson: get glib compilation flags from GLIB_CFLAGS, Paolo Bonzini, 2020/09/04
- [PULL 30/46] Makefile: inline the relevant parts of rules.mak, Paolo Bonzini, 2020/09/04
- [PULL 36/46] configure: do not look for install(1), Paolo Bonzini, 2020/09/04
- [PULL 39/46] configure: drop dead variables and functions, Paolo Bonzini, 2020/09/04
- [PULL 38/46] configure: do not include dependency flags in QEMU_CFLAGS and LIBS, Paolo Bonzini, 2020/09/04
- [PULL 43/46] meson: specify fuzz linker script as a project arg, Paolo Bonzini, 2020/09/04
- [PULL 46/46] meson: remove linkage of sdl to baum, Paolo Bonzini, 2020/09/04
- [PULL 44/46] fuzz: Add support for custom fuzzing library, Paolo Bonzini, 2020/09/04
- [PULL 45/46] meson: Convert undefsym.sh to undefsym.py, Paolo Bonzini, 2020/09/04