diff options
| author | Richard Henderson | 2021-09-30 18:36:36 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-06 01:53:17 +0200 |
| commit | 08a13c4b247338329951238a6c47b94f70c387d2 (patch) | |
| tree | 3dddbca9a04fed29b8fffa43e8ee6c54f0c1edb6 /tests/docker/dockerfiles/fedora-i386-cross.docker | |
| parent | tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES (diff) | |
| download | qemu-08a13c4b247338329951238a6c47b94f70c387d2.tar.gz qemu-08a13c4b247338329951238a6c47b94f70c387d2.tar.xz qemu-08a13c4b247338329951238a6c47b94f70c387d2.zip | |
tests/docker: Fix fedora-i386-cross cross-compilation
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>
Diffstat (limited to 'tests/docker/dockerfiles/fedora-i386-cross.docker')
| -rw-r--r-- | tests/docker/dockerfiles/fedora-i386-cross.docker | 5 |
1 files 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 |