[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/28] tests/docker: Fix fedora-i386-cross cross-compilation
From: |
Richard Henderson |
Subject: |
[PULL 02/28] tests/docker: Fix fedora-i386-cross cross-compilation |
Date: |
Wed, 6 Oct 2021 08:19:48 -0700 |
By using PKG_CONFIG_PATH instead of PKG_CONFIG_LIBDIR,
we were still including the 64-bit packages. Install
pcre-devel.i686 to fill a missing glib2 dependency.
By using --extra-cflags instead of --cpu, we incorrectly
use the wrong probing during meson.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210930163636.721311-3-richard.henderson@linaro.org>
---
tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker
b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 84f2697b6c..f62a71ce22 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -18,13 +18,14 @@ ENV PACKAGES \
glibc-static.i686 \
gnutls-devel.i686 \
nettle-devel.i686 \
+ pcre-devel.i686 \
perl-Test-Harness \
pixman-devel.i686 \
sysprof-capture-devel.i686 \
zlib-devel.i686
-ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
-ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
+ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
+ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
RUN dnf update -y && dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.25.1
- [PULL 00/28] tcg patch queue, Richard Henderson, 2021/10/06
- [PULL 02/28] tests/docker: Fix fedora-i386-cross cross-compilation,
Richard Henderson <=
- [PULL 03/28] tcg: add dup_const_tl wrapper, Richard Henderson, 2021/10/06
- [PULL 08/28] trace/mem: Pass MemOpIdx to trace_mem_get_info, Richard Henderson, 2021/10/06
- [PULL 06/28] tcg: Rename TCGMemOpIdx to MemOpIdx, Richard Henderson, 2021/10/06
- [PULL 05/28] tcg: Expand MO_SIZE to 3 bits, Richard Henderson, 2021/10/06
- [PULL 07/28] tcg: Split out MemOpIdx to exec/memopidx.h, Richard Henderson, 2021/10/06
- [PULL 14/28] tcg/s390x: Rename from tcg/s390, Richard Henderson, 2021/10/06
- [PULL 04/28] accel/tcg: Drop signness in tracing in cputlb.c, Richard Henderson, 2021/10/06
- [PULL 13/28] tcg: Expand usadd/ussub with umin/umax, Richard Henderson, 2021/10/06
- [PULL 10/28] plugins: Reorg arguments to qemu_plugin_vcpu_mem_cb, Richard Henderson, 2021/10/06
- [PULL 16/28] tcg/s390x: Merge TCG_AREG0 and TCG_REG_CALL_STACK into TCGReg, Richard Henderson, 2021/10/06