diff --git a/packaging/deps.sh b/packaging/deps.sh index 8dda19523..26cca2188 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -295,21 +295,21 @@ if ! pkg-config "comedilib >= 0.11.0" && \ fi # Build & Install libre -# if ! pkg-config "libre >= 3.6.0" && \ -# should_build "libre" "for the rtp node-type"; then -# git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git -# mkdir -p re/build -# pushd re/build -# cmake -DUSE_LIBREM=OFF \ -# -DUSE_BFCP=OFF \ -# -DUSE_PCP=OFF \ -# -DUSE_RTMP=OFF \ -# -DUSE_SIP=OFF \ -# -DLIBRE_BUILD_STATIC=OFF \ -# ${CMAKE_OPTS} .. -# make ${MAKE_OPTS} install -# popd -# fi +if ! pkg-config "libre >= 3.6.0" && \ + should_build "libre" "for the rtp node-type"; then + git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git + mkdir -p re/build + pushd re/build + cmake -DUSE_LIBREM=OFF \ + -DUSE_BFCP=OFF \ + -DUSE_PCP=OFF \ + -DUSE_RTMP=OFF \ + -DUSE_SIP=OFF \ + -DLIBRE_BUILD_STATIC=OFF \ + ${CMAKE_OPTS} .. + make ${MAKE_OPTS} install + popd +fi # Build & Install nanomsg if ! pkg-config "nanomsg >= 1.0.0" && \ diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 7e8c9e677..1c07499db 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -77,8 +77,6 @@ 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