summaryrefslogtreecommitdiff
path: root/azure
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-09-05 22:10:12 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-09-05 22:10:12 +0200
commitaa613f8b1a4997b8a955422beee5c1e738b3e1e8 (patch)
treeafd12bb5d3e8a95d8e5ba2535f2e5a19042d7b74 /azure
parentd57f9e5ea41aac7e40d37b6335cd2e03bf3b73fa (diff)
parent4ebc04ca9d0a8871dc511f48977c36a4c9782ee0 (diff)
downloadphp-git-aa613f8b1a4997b8a955422beee5c1e738b3e1e8.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix azure i386 build
Diffstat (limited to 'azure')
-rw-r--r--azure/i386/apt.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml
index 4dd09423c9..1620080304 100644
--- a/azure/i386/apt.yml
+++ b/azure/i386/apt.yml
@@ -7,8 +7,9 @@ steps:
sudo apt-get update -y | true
sudo apt-get install -y gcc-multilib
sudo apt-get install -y g++-multilib
- sudo apt-get purge -y libxml2 libsqlite3-0
+ sudo apt-get purge -y libxml2
# TODO: Reenable postgresql + postgresql-contrib packages once they work again.
+ sudo apt-get purge -y libpq5
sudo apt-get install -y bison \
re2c \
locales \