Merge branch '3.4' into 4.0
* 3.4: [travis] fix libsodium install
This commit is contained in:
commit
c3afab9245
|
@ -135,11 +135,9 @@ before_install:
|
||||||
# Install extra PHP extensions
|
# Install extra PHP extensions
|
||||||
if [[ ! $skip ]]; then
|
if [[ ! $skip ]]; then
|
||||||
# install libsodium
|
# 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 add-apt-repository ppa:ondrej/php -y
|
||||||
sudo apt-get update -q
|
sudo apt-get update -q
|
||||||
sudo apt-get install libsodium-dev -y
|
sudo apt-get install libsodium-dev -y
|
||||||
fi
|
|
||||||
|
|
||||||
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
|
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
|
||||||
tfold ext.libsodium tpecl libsodium sodium.so $INI
|
tfold ext.libsodium tpecl libsodium sodium.so $INI
|
||||||
|
|
Reference in New Issue