From fabf232e7c7351b2245aeae9deb9984918013155 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 7 Jun 2020 00:16:02 +0200 Subject: [PATCH] docker: skip libuldaq on Debian multiarch builds --- packaging/deps.sh | 2 +- packaging/docker/Dockerfile.dev-debian-multiarch | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/deps.sh b/packaging/deps.sh index c7763930b..6cace05bf 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -102,7 +102,7 @@ if ! pkg-config "libwebsockets >= 2.3.0"; then fi # Build & Install uldaq -if ! pkg-config "libuldaq >= 1.0.0"; then +if [ "${DEBIAN_MULTIARCH}" != "1" ] && ! pkg-config "libuldaq >= 1.0.0"; then git clone https://github.com/stv0g/uldaq pushd uldaq git checkout rpmbuild diff --git a/packaging/docker/Dockerfile.dev-debian-multiarch b/packaging/docker/Dockerfile.dev-debian-multiarch index c15183cc1..0f816e543 100644 --- a/packaging/docker/Dockerfile.dev-debian-multiarch +++ b/packaging/docker/Dockerfile.dev-debian-multiarch @@ -88,6 +88,8 @@ ENV PKG_CONFIG_LIBDIR=/usr/lib/${TRIPLET}/pkgconfig:/usr/share/pkgconfig ENV CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/${TRIPLET}" +ENV DEBIAN_MULTIARCH=1 + # Install unpackaged dependencies from source ADD packaging/deps.sh / RUN bash deps.sh