diff options
author | iphydf <iphydf@users.noreply.github.com> | 2020-03-22 02:07:56 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2020-03-22 11:22:06 +0000 |
commit | b0047368303b648bf0abccdf14d603dbf7564443 (patch) | |
tree | 3a8f97af515b063ade7aaed74c23bb65c5858b06 | |
parent | f148d5bd0ab39d0dab4a35b831e70fdb3dfe8e4d (diff) |
Install libsodium from apt instead of from source.
-rw-r--r-- | .travis.yml | 1 | ||||
-rwxr-xr-x | .travis/cmake-linux | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index de83351f..f8cf6c45 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -19,6 +19,7 @@ jobs: | |||
19 | packages: | 19 | packages: |
20 | - libconfig-dev # For tox-bootstrapd. | 20 | - libconfig-dev # For tox-bootstrapd. |
21 | - libopus-dev # For toxav. | 21 | - libopus-dev # For toxav. |
22 | - libsodium-dev # For toxcore. | ||
22 | - libgtest-dev # For unit tests. | 23 | - libgtest-dev # For unit tests. |
23 | - libvpx-dev # For toxav. | 24 | - libvpx-dev # For toxav. |
24 | - ninja-build | 25 | - ninja-build |
diff --git a/.travis/cmake-linux b/.travis/cmake-linux index c0d175f8..0deeaacc 100755 --- a/.travis/cmake-linux +++ b/.travis/cmake-linux | |||
@@ -42,16 +42,6 @@ travis_install() { | |||
42 | make -C "$CACHEDIR/astyle/build/gcc" clean | 42 | make -C "$CACHEDIR/astyle/build/gcc" clean |
43 | make -C "$CACHEDIR/astyle/build/gcc" "-j$NPROC" | 43 | make -C "$CACHEDIR/astyle/build/gcc" "-j$NPROC" |
44 | } | 44 | } |
45 | |||
46 | # Install libsodium (not in ubuntu-precise). | ||
47 | [ -f "$CACHEDIR/lib/libsodium.a" ] || { | ||
48 | git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium ../libsodium | ||
49 | cd ../libsodium # pushd | ||
50 | ./autogen.sh | ||
51 | ./configure --prefix="$CACHEDIR" | ||
52 | make install "-j$NPROC" | ||
53 | cd - # popd | ||
54 | } | ||
55 | } | 45 | } |
56 | 46 | ||
57 | run_static_analysis() { | 47 | run_static_analysis() { |