[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CO
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images |
Date: |
Wed, 17 Jul 2019 14:43:23 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
This silents a bunch of warnings while compiling the Slirp objects:
$ make
[...]
CC slirp/src/tftp.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
CC slirp/src/udp6.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
[...]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker
b/tests/docker/dockerfiles/debian-win32-cross.docker
index 77f5cc45e92..dc74ce7e0e0 100644
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ b/tests/docker/dockerfiles/debian-win32-cross.docker
@@ -11,6 +11,9 @@ ENV TARGET i686
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+ENV PKG_CONFIG_PATH \
+ $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker
b/tests/docker/dockerfiles/debian-win64-cross.docker
index 3908c5abc42..df7bfce7eab 100644
--- a/tests/docker/dockerfiles/debian-win64-cross.docker
+++ b/tests/docker/dockerfiles/debian-win64-cross.docker
@@ -11,6 +11,9 @@ ENV TARGET x86-64
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+ENV PKG_CONFIG_PATH \
+ $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
--
2.20.1
- [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs, (continued)
- [Qemu-devel] [PATCH v2 02/23] tests/docker: add test-misc for building tools & docs, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 03/23] tests/docker: Install Sphinx in the Ubuntu images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 05/23] tests/docker: Install Ubuntu images noninteractively, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 06/23] tests/migration-test: don't spam the logs when we fail, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 08/23] shippable: re-enable the windows cross builds, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 07/23] tests/dockerfiles: update the win cross builds to stretch, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 09/23] tests/docker: Install Sphinx in the Debian images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 10/23] tests/docker: Install the NSIS tools in the MinGW capable images, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 12/23] tests/docker: Install texinfo in the Fedora image, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 18/23] travis: enable travis_retry for check phase, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 20/23] tests/qemu-iotests/check: Allow tests without groups, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 15/23] tests/docker: Let the test-mingw test generate a NSIS installer, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 13/23] buildsys: The NSIS Windows build requires the documentation installed, Alex Bennée, 2019/07/17
- [Qemu-devel] [PATCH v2 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already, Alex Bennée, 2019/07/17