| Message ID | 20210930163636.721311-3-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | tests/docker: Fix fedora-i386-cross | expand |
On Thu, Sep 30, 2021 at 12:36:36PM -0400, Richard Henderson wrote: > 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. > > Cc: Alex Bennée <alex.bennee@linaro.org> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Daniel P. Berrangé <berrange@redhat.com> > Cc: Richard W.M. Jones <rjones@redhat.com> > Signed-off-by: Richard Henderson <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 dbb8195eb1..820740d5be 100644 > --- a/tests/docker/dockerfiles/fedora-i386-cross.docker > +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker > @@ -17,12 +17,13 @@ ENV PACKAGES \ > glibc-static.i686 \ > gnutls-devel.i686 \ > nettle-devel.i686 \ > + pcre-devel.i686 \ > perl-Test-Harness \ > pixman-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 install -y $PACKAGES > RUN rpm -q $PACKAGES | sort > /packages.txt While I'm not able to directly test this docker file, I did run the equivalent commands (PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ../configure --cpu=i386 [etc]) and successfully build a 32-bit qemu binary on Fedora 64-bit host with the multilib libraries installed. Therefore I'm pretty confident it should work: Reviewed-by: Richard W.M. Jones <rjones@redhat.com> Rich.
On Thu, Sep 30, 2021 at 12:36:36PM -0400, Richard Henderson wrote: > 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. > > Cc: Alex Bennée <alex.bennee@linaro.org> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Daniel P. Berrangé <berrange@redhat.com> > Cc: Richard W.M. Jones <rjones@redhat.com> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index dbb8195eb1..820740d5be 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -17,12 +17,13 @@ ENV PACKAGES \ glibc-static.i686 \ gnutls-devel.i686 \ nettle-devel.i686 \ + pcre-devel.i686 \ perl-Test-Harness \ pixman-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 install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt
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. Cc: Alex Bennée <alex.bennee@linaro.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Daniel P. Berrangé <berrange@redhat.com> Cc: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)