From 59ecd740d4e1a980deed4ea20a68fc4769804e78 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Wed, 14 Jun 2023 22:42:11 +0200 Subject: [PATCH] add libnice dependency to other Dockerfiles Signed-off-by: Philipp Jungkamp --- packaging/deps.sh | 12 ++++++++---- packaging/docker/Dockerfile.debian | 3 ++- packaging/docker/Dockerfile.rocky | 3 ++- packaging/docker/Dockerfile.ubuntu | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packaging/deps.sh b/packaging/deps.sh index a8e1de90e..b8a792e0b 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -319,16 +319,20 @@ fi # Build & Install libdatachannel if ! cmake --find-package -DNAME=LibDataChannel -DCOMPILER_ID=GNU -DLANGUAGE=CXX -DMODE=EXIST && \ [ -z "${SKIP_LIBDATACHANNEL}" ]; then - git clone ${GIT_OPTS} --branch v0.18.4 https://github.com/paullouisageneau/libdatachannel && pushd libdatachannel + git clone ${GIT_OPTS} --branch v0.18.4 https://github.com/paullouisageneau/libdatachannel && pushd libdatachannel git submodule update --init --recursive --depth 1 mkdir build && pushd build - cmake -DUSE_NICE=ON \ - -DNO_MEDIA=ON \ + if pkg-config "nice >= 0.1.16"; then + CMAKE_DATACHANNEL_USE_NICE=-DUSE_NICE=ON + fi + + cmake -DNO_MEDIA=ON \ -DNO_WEBSOCKET=ON \ + ${CMAKE_DATACHANNEL_USE_NICE} \ ${CMAKE_OPTS} .. - make ${MAKE_OPTS} ${TARGET} + make ${MAKE_OPTS} install popd; popd fi diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index f2aa59c7f..f6ad41769 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -49,7 +49,8 @@ RUN apt-get update && \ libfmt-dev \ libspdlog-dev \ liblua5.3-dev \ - libhiredis-dev + libhiredis-dev \ + libnice-dev # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky index 30bea298e..ea0fd1212 100644 --- a/packaging/docker/Dockerfile.rocky +++ b/packaging/docker/Dockerfile.rocky @@ -46,7 +46,8 @@ RUN dnf -y install \ librdmacm-devel \ libusb1-devel \ lua-devel \ - hiredis-devel + hiredis-devel \ + libnice-devel # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 50136383a..870e76a0c 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -51,7 +51,8 @@ RUN apt-get update && \ libfmt-dev \ libspdlog-dev \ liblua5.3-dev \ - libhiredis-dev + libhiredis-dev \ + libnice-dev # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \