From d48d9ed4dcd6a2fc1ef637a71470cad68b937b1b Mon Sep 17 00:00:00 2001 From: Urras Date: Tue, 10 Feb 2015 09:47:06 -0500 Subject: [PATCH 1/2] Travis should build with Libsodium stable --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 210bdb7..984a12a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_script: # Installing libsodium, needed for toxcore - git clone https://github.com/jedisct1/libsodium.git libsodium - cd libsodium - - git checkout tags/0.7.0 > /dev/null + - git checkout tags/1.0.0 > /dev/null - ./autogen.sh > /dev/null - ./configure > /dev/null - make check -j2 || make check || exit 1 > /dev/null From e230badb47fc76a051b504952b1c0ddbc5f60624 Mon Sep 17 00:00:00 2001 From: Urras Date: Tue, 10 Feb 2015 10:01:44 -0500 Subject: [PATCH 2/2] Fix Clang I didn't expect this to work, but it is and I'm not complaining. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 984a12a..28d89b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: c compiler: - gcc - # - clang # Fix me + - clang before_script: # Installing yasm (needed for compiling vpx) and openal - - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev + - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev clang llvm-dev # Installing libsodium, needed for toxcore - git clone https://github.com/jedisct1/libsodium.git libsodium - cd libsodium