[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PK
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-ppc] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images |
Date: |
Mon, 15 Jul 2019 19:48:11 +0200 |
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>
---
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 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 \
--
2.20.1
- [Qemu-ppc] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 2/9] tests/docker: Install Sphinx in the Debian images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images,
Philippe Mathieu-Daudé <=
- [Qemu-ppc] [PATCH-for-4.1 v2 3/9] tests/docker: Install the NSIS tools in the MinGW capable images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 5/9] tests/docker: Install texinfo in the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation installed, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 7/9] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 8/9] tests/docker: Let the test-mingw test generate a NSIS installer, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 9/9] NSIS: Add missing firmware blobs, Philippe Mathieu-Daudé, 2019/07/15
- Re: [Qemu-ppc] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Alex Bennée, 2019/07/16