Skip to content
Snippets Groups Projects
Commit faa1bea8 authored by inso's avatar inso
Browse files

Fix libsodium version

parent 1e3c30e9
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,8 @@ then ...@@ -32,8 +32,8 @@ then
chmod +x qt-opensource-linux-x64-5.8.0.run chmod +x qt-opensource-linux-x64-5.8.0.run
./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs ./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.11-2_amd64.deb wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.13-1_amd64.deb
sudo dpkg -i libsodium18_1.0.11-2_amd64.deb sudo dpkg -i libsodium18_1.0.13-1_amd64.deb
rm -r ~/.pyenv rm -r ~/.pyenv
git clone https://github.com/yyuu/pyenv.git ~/.pyenv git clone https://github.com/yyuu/pyenv.git ~/.pyenv
echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
......
...@@ -34,10 +34,10 @@ if is_darwin: ...@@ -34,10 +34,10 @@ if is_darwin:
if is_linux: if is_linux:
libsodium_path = ctypes.util.find_library('libsodium.so') libsodium_path = ctypes.util.find_library('libsodium.so')
if not libsodium_path: if not libsodium_path:
if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.1.1'): if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0'):
libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.1.1" libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0"
if os.path.isfile('/usr/lib/i386-linux-gnu/libsodium.so.18.1.1'): if os.path.isfile('/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0'):
libsodium_path = "/usr/lib/i386-linux-gnu/libsodium.so.18.1.1" libsodium_path = "/usr/lib/x86_64-linux-gnu/libsodium.so.18.3.0"
a.binaries = a.binaries + TOC([('libsodium.so', libsodium_path, 'BINARY')]) a.binaries = a.binaries + TOC([('libsodium.so', libsodium_path, 'BINARY')])
a.datas = a.datas + [('sakia/root_servers.yml', 'src/sakia/root_servers.yml', 'DATA')] a.datas = a.datas + [('sakia/root_servers.yml', 'src/sakia/root_servers.yml', 'DATA')]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment