diff mbox series

[2/2] tests/docker: Fix fedora-i386-cross

Message ID 20211001153347.1736014-5-richard.henderson@linaro.org
State Superseded
Headers show
Series nios2: Enable cross compile and fix signals | expand

Commit Message

Richard Henderson Oct. 1, 2021, 3:33 p.m. UTC 
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(-)

-- 
2.25.1

Comments

Alex Bennée Oct. 14, 2021, 9:38 a.m. UTC | #1 
Richard Henderson <richard.henderson@linaro.org> writes:

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


Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


-- 
Alex Bennée
diff mbox series

Patch

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