diff options
| author | Philippe Mathieu-Daudé | 2019-07-15 19:48:11 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-07-23 16:53:25 +0200 |
| commit | a88819edded1d5a6de13a14edb2c016e96ca45ea (patch) | |
| tree | 600b6123cc27c51323b41729a7ee9a8e59d675db /tests/docker | |
| parent | tests/docker: Install the NSIS tools in the MinGW capable images (diff) | |
| download | qemu-a88819edded1d5a6de13a14edb2c016e96ca45ea.tar.gz qemu-a88819edded1d5a6de13a14edb2c016e96ca45ea.tar.xz qemu-a88819edded1d5a6de13a14edb2c016e96ca45ea.zip | |
tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
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é <philmd@redhat.com>
Message-Id: <20190715174817.18981-5-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/debian-win32-cross.docker | 3 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-win64-cross.docker | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index 77f5cc45e9..dc74ce7e0e 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 3908c5abc4..df7bfce7ea 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 \ |