Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

docker: skip libuldaq on Debian multiarch builds

Browse source
This commit is contained in:
Steffen Vogel 2020-06-07 00:16:02 +02:00
parent a111e4869c
commit fabf232e7c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/deps.sh
View file

@ -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

2
packaging/docker/Dockerfile.dev-debian-multiarch
View file

@ -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