Install libsodium from apt instead of from source.

TokTok · Mar 22, 2020 · b004736 · b004736
1 parent f148d5b
commit b004736
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ jobs:
           packages:
             - libconfig-dev          # For tox-bootstrapd.
             - libopus-dev            # For toxav.
+            - libsodium-dev          # For toxcore.
             - libgtest-dev           # For unit tests.
             - libvpx-dev             # For toxav.
             - ninja-build

diff --git a/.travis/cmake-linux b/.travis/cmake-linux
@@ -42,16 +42,6 @@ travis_install() {
     make -C "$CACHEDIR/astyle/build/gcc" clean
     make -C "$CACHEDIR/astyle/build/gcc" "-j$NPROC"
   }
-
-  # Install libsodium (not in ubuntu-precise).
-  [ -f "$CACHEDIR/lib/libsodium.a" ] || {
-    git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium ../libsodium
-    cd ../libsodium  # pushd
-    ./autogen.sh
-    ./configure --prefix="$CACHEDIR"
-    make install "-j$NPROC"
-    cd -  # popd
-  }
 }
 
 run_static_analysis() {