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>
32 lines
681 B
Docker
32 lines
681 B
Docker
FROM registry.fedoraproject.org/fedora:34
|
|
|
|
ENV PACKAGES \
|
|
bzip2 \
|
|
ccache \
|
|
diffutils \
|
|
findutils \
|
|
gcc \
|
|
git \
|
|
libffi-devel.i686 \
|
|
libtasn1-devel.i686 \
|
|
libzstd-devel.i686 \
|
|
make \
|
|
meson \
|
|
ninja-build \
|
|
glib2-devel.i686 \
|
|
glibc-devel.i686 \
|
|
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 --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
|