diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09792e3b6..14304feb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,6 @@ build:source: -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -DWITH_WEB=OFF - -DWITH_RTP=OFF -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake -DCMAKE_PREFIX_PATH=/usr/local diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 4fccbcf9c..7e8c9e677 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -62,7 +62,6 @@ RUN apt-get update && \ # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ - ldconfig && \ echo /usr/local/lib64 >> /etc/ld.so.conf ADD cmake/toolchains/debian-${ARCH}.cmake / @@ -78,6 +77,8 @@ ENV CMAKE_EXTRA_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \ ENV CONFIGURE_OPTS="--libdir=${PREFIX}/lib/${TRIPLET}" +ENV LD_LIBRARY_PATH=/usr/local/lib + RUN mkdir -p /usr/local/lib/${TRIPLET} ENV CPP=${TRIPLET}-cpp