From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 24 Feb 2020 10:00:58 +0000 (+0100)
Subject: Enable ext/sodium in CI
X-Git-Tag: php-7.4.7RC1~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d15845ae11cfcbf14debcb1f7b480499de66185;p=php

Enable ext/sodium in CI
---

diff --git a/.travis.yml b/.travis.yml
index c408d260cd..d12e846f2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
       - libpspell-dev
       - libsasl2-dev
       - libsqlite3-dev
+      - libsodium-dev
       - libtidy-dev
       - libwebp-dev
       - libxml2-dev
diff --git a/azure/apt.yml b/azure/apt.yml
index 3019d82379..2beb625f62 100644
--- a/azure/apt.yml
+++ b/azure/apt.yml
@@ -30,6 +30,7 @@ steps:
                        libreadline-dev \
                        libldap2-dev \
                        libsasl2-dev \
+                       libsodium-dev \
                        libargon2-0-dev \
                        postgresql \
                        postgresql-contrib \
diff --git a/azure/configure.yml b/azure/configure.yml
index 9de67ae13f..1d3374bfa0 100644
--- a/azure/configure.yml
+++ b/azure/configure.yml
@@ -55,6 +55,7 @@ steps:
         --with-ldap-sasl \
         --with-password-argon2 \
         --with-mhash \
+        --with-sodium \
         --enable-werror \
         --with-config-file-path=/etc \
         --with-config-file-scan-dir=/etc/php.d
diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml
index 9342df35e4..022bf96f30 100644
--- a/azure/i386/apt.yml
+++ b/azure/i386/apt.yml
@@ -40,6 +40,7 @@ steps:
                               libreadline-dev:i386 \
                               libffi-dev:i386 \
                               libfreetype6-dev:i386 \
+                              libsodium-dev:i386 \
                               postgresql \
                               postgresql-contrib \
                               ${{ parameters.packages }}
diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index 0806a246e9..2b1e9847af 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -62,6 +62,7 @@ jobs:
             --with-ffi \
             --enable-zend-test \
             --with-mhash \
+            --with-sodium \
             --enable-werror \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d
diff --git a/azure/macos/job.yml b/azure/macos/job.yml
index 1a6aefd633..4b979d41a8 100644
--- a/azure/macos/job.yml
+++ b/azure/macos/job.yml
@@ -65,6 +65,7 @@ jobs:
             --enable-zend-test \
             --enable-intl \
             --with-mhash \
+            --with-sodium \
             --enable-werror \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d
diff --git a/travis/compile.sh b/travis/compile.sh
index d14309a0dd..2b2a4424c4 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -75,6 +75,7 @@ $TS \
 --with-kerberos \
 --enable-sysvmsg \
 --with-ffi \
+--with-sodium \
 --enable-zend-test=shared \
 --enable-werror \
 --with-pear