Skip to content
Snippets Groups Projects
Unverified Commit 519e16a3 authored by Amin Bandali's avatar Amin Bandali
Browse files

packaging: use system libarchive on Debian 10

The bundled one from the daemon contribs does not build on Debian 10
for some reason.

Change-Id: Id6fbc1e09bdf2912663f78502b255e975aebec1a
parent 2f1ebdd4
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ RUN apt-get install -y -o Acquire::Retries=10 \ ...@@ -12,6 +12,7 @@ RUN apt-get install -y -o Acquire::Retries=10 \
g++-8 \ g++-8 \
clang \ clang \
clang-tools \ clang-tools \
libarchive-dev \
wget wget
ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
......
...@@ -31,6 +31,10 @@ JAMI_DAEMON_PKG_NAME="jami-daemon" ...@@ -31,6 +31,10 @@ JAMI_DAEMON_PKG_NAME="jami-daemon"
# Bundled packages from contrib # Bundled packages from contrib
BUNDLED_PKGS="" BUNDLED_PKGS=""
ifeq (debian_10,$(findstring debian_10, $(DISTRIBUTION)))
# Daemon's bundled libarchive does not build on Debian 10
BUNDLED_PKGS="--disable-libarchive"
endif
ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION))) ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION)))
# Raspbian's yaml-cpp lib does not work properly # Raspbian's yaml-cpp lib does not work properly
BUNDLED_PKGS="--enable-ffmpeg --enable-yaml-cpp" BUNDLED_PKGS="--enable-ffmpeg --enable-yaml-cpp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment