From 06680f106cdd684c4671a1fbbd8d1420ace1d01d Mon Sep 17 00:00:00 2001 From: ashthespy Date: Tue, 16 Jul 2019 19:36:20 +0200 Subject: [PATCH 1/2] Add `pkg-config` to docker build container --- contrib/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 0fcdaff..9cf2d13 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -21,7 +21,7 @@ RUN dpkg --add-architecture armel RUN dpkg --add-architecture mipsel RUN apt-get update -RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf crossbuild-essential-mipsel +RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf crossbuild-essential-mipsel pkg-config RUN apt-get install -y libasound2-dev libasound2-dev:arm64 libasound2-dev:armel libasound2-dev:armhf libasound2-dev:mipsel RUN curl https://sh.rustup.rs -sSf | sh -s -- -y @@ -43,6 +43,7 @@ RUN mkdir /build && \ ENV CARGO_TARGET_DIR /build ENV CARGO_HOME /build/cache +ENV PKG_CONFIG_ALLOW_CROSS=1 ADD . /src WORKDIR /src From 939fc583e7e8221a457085f8e63918caa224778e Mon Sep 17 00:00:00 2001 From: ashthespy Date: Fri, 1 Nov 2019 17:01:58 +0100 Subject: [PATCH 2/2] Help `pkg-config` with explicit paths --- contrib/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 9cf2d13..74b83d3 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -44,6 +44,10 @@ RUN mkdir /build && \ ENV CARGO_TARGET_DIR /build ENV CARGO_HOME /build/cache ENV PKG_CONFIG_ALLOW_CROSS=1 +ENV PKG_CONFIG_PATH_aarch64-unknown-linux-gnu=/usr/lib/aarch64-linux-gnu/pkgconfig/ +ENV PKG_CONFIG_PATH_arm-unknown-linux-gnueabihf=/usr/lib/arm-linux-gnueabihf/pkgconfig/ +ENV PKG_CONFIG_PATH_arm-unknown-linux-gnueabi=/usr/lib/arm-linux-gnueabi/pkgconfig/ +ENV PKG_CONFIG_PATH_mipsel-unknown-linux-gnu=/usr/lib/mipsel-linux-gnu/pkgconfig/ ADD . /src WORKDIR /src