OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Richard Henderson 2021-09-30 12:36:36 -04:00
parent 6a2b0fd171
commit 08a13c4b24
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/docker/dockerfiles/fedora-i386-cross.docker
View File

@ -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