Merge branch '3.4' into 4.0

* 3.4:
  [travis] fix libsodium install
This commit is contained in:
Nicolas Grekas 2018-02-22 15:57:28 +01:00
commit c3afab9245
1 changed files with 3 additions and 5 deletions

View File

@ -135,11 +135,9 @@ before_install:
# Install extra PHP extensions
if [[ ! $skip ]]; then
# install libsodium
if [[ ! -e ~/php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then
sudo add-apt-repository ppa:ondrej/php -y
sudo apt-get update -q
sudo apt-get install libsodium-dev -y
fi
sudo add-apt-repository ppa:ondrej/php -y
sudo apt-get update -q
sudo apt-get install libsodium-dev -y
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
tfold ext.libsodium tpecl libsodium sodium.so $INI