From ed3cd2b927b0f17b55c48ab0a0e3ee5c0a938882 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 3 Nov 2020 11:46:24 +0100 Subject: [PATCH] pkgdep/git: [qemu] Ignore address-of-packed-member errors Also, disable docs building since it fails on newer GCCs (>=10). Last but not least, move all the -Wno-error flags to a separate array to make code a bit clearer. Change-Id: Ieb6d30778140c745a8c9f0ccd83bf4acd3a0acd5 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5004 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- test/common/config/pkgdep/git | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index b4563439d..038727f0c 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -186,9 +186,14 @@ function install_qemu() { fi declare -a opt_params=("--prefix=/usr/local/qemu/$SPDK_QEMU_BRANCH") + declare -a extra_cflags=() + + opt_params+=("--disable-docs") if ((gcc_version >= 9)); then # GCC 9 fails to compile Qemu due to some old warnings which were not detected by older versions. - opt_params+=("--extra-cflags=-Wno-error=stringop-truncation -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-error=format-truncation") + extra_cflags+=("-Wno-error=stringop-truncation" "-Wno-error=deprecated-declarations") + extra_cflags+=("-Wno-error=incompatible-pointer-types" "-Wno-error=format-truncation") + extra_cflags+=("-Wno-error=address-of-packed-member") opt_params+=("--disable-glusterfs") fi @@ -199,6 +204,7 @@ function install_qemu() { opt_params+=("--with-git='tsocks git'") fi fi + opt_params+=("--extra-cflags=${extra_cflags[*]}") sed -i s@git://git.qemu.org/@https://github.com/qemu/@g "$GIT_REPOS/qemu/$SPDK_QEMU_BRANCH/.gitmodules" sed -i s@git://git.qemu.org/@https://github.com/qemu/@g "$GIT_REPOS/qemu/$SPDK_QEMU_BRANCH/.git/config"