From b6dde3c76ff5382b0dc1caf7323b82e2f9611838 Mon Sep 17 00:00:00 2001
From: Maxim Biro <nurupo.contributions@gmail.com>
Date: Wed, 26 Sep 2018 23:34:27 -0400
Subject: Use cmake to build toxcore in tox-boostrapd's Dockerfile

---
 other/bootstrap_daemon/docker/Dockerfile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/other/bootstrap_daemon/docker/Dockerfile b/other/bootstrap_daemon/docker/Dockerfile
index 06bf66eb..b056773e 100644
--- a/other/bootstrap_daemon/docker/Dockerfile
+++ b/other/bootstrap_daemon/docker/Dockerfile
@@ -4,14 +4,10 @@ WORKDIR /tmp/tox
 
 RUN export BUILD_PACKAGES="\
       build-essential \
-      libtool \
-      autotools-dev \
-      automake \
-      checkinstall \
+      cmake \
       git \
-      yasm \
-      libsodium-dev \
       libconfig-dev \
+      libsodium-dev \
       python3" && \
     export RUNTIME_PACKAGES="\
       libconfig9 \
@@ -22,12 +18,21 @@ RUN export BUILD_PACKAGES="\
     git clone https://github.com/TokTok/c-toxcore && \
     cd c-toxcore && \
     # checkout latest release version
-    git checkout $(git tag --list | grep -P '^v(\d+).(\d+).(\d+)$' | sed "s/v/v /g" | sed "s/\./ /g" | sort -snk4,4 | sort -snk3,3 | sort -snk2,2 | tail -n 1 | sed 's/v /v/g' | sed 's/ /\./g') && \
-    ./autogen.sh && \
-    ./configure --enable-daemon && \
+    git checkout $(git tag --list | grep -P '^v(\d+).(\d+).(\d+)$' | \
+      sed "s/v/v /g" | sed "s/\./ /g" | \
+      sort -snk4,4 | sort -snk3,3 | sort -snk2,2 | tail -n 1 | \
+      sed 's/v /v/g' | sed 's/ /\./g') && \
+    mkdir _build && \
+    cd _build && \
+    cmake .. \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DENABLE_SHARED=ON \
+      -DENABLE_STATIC=OFF \
+      -DBUILD_TOXAV=OFF \
+      -DBOOTSTRAP_DAEMON=ON && \
     make -j`nproc` && \
     make install -j`nproc` && \
-    ldconfig && \
+    cd .. && \
 # add new user
     useradd --home-dir /var/lib/tox-bootstrapd --create-home \
       --system --shell /sbin/nologin \
-- 
cgit v1.2.3