From e0d207010865dc7f23d322f07f1540112da7124c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 12 Jun 2020 15:09:43 +0200
Subject: [PATCH 1/2] Use shared setup.yml on azure

Make sure things stay synchronized between different x64 jobs.
---
 azure/coverage_job.yml | 6 +-----
 azure/job.yml          | 9 +--------
 azure/setup.yml        | 9 +++++++++
 3 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 azure/setup.yml

diff --git a/azure/coverage_job.yml b/azure/coverage_job.yml
index d5720b87f8f..01bde10281c 100644
--- a/azure/coverage_job.yml
+++ b/azure/coverage_job.yml
@@ -20,11 +20,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - template: install.yml
-    - script: |
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
+    - template: setup.yml
     - template: test.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}
diff --git a/azure/job.yml b/azure/job.yml
index a262d33f002..2893653b18d 100644
--- a/azure/job.yml
+++ b/azure/job.yml
@@ -17,14 +17,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - template: install.yml
-    - script: |
-        set -e
-        sudo service mysql start
-        sudo service postgresql start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
+    - template: setup.yml
     - template: test.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}
diff --git a/azure/setup.yml b/azure/setup.yml
new file mode 100644
index 00000000000..dbf7921c47e
--- /dev/null
+++ b/azure/setup.yml
@@ -0,0 +1,9 @@
+steps:
+  - script: |
+      set -e
+      sudo service mysql start
+      sudo service postgresql start
+      mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
+      sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+      sudo -u postgres psql -c "CREATE DATABASE test;"
+    displayName: 'Setup'

From 8641d76f62273f3a73449fd720c93c63992f3b5a Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 12 Jun 2020 15:12:15 +0200
Subject: [PATCH 2/2] Drop freetype from i386

For some reason this seems to pick up the amd64 library (though
we do install the i386 one).
---
 azure/i386/apt.yml | 1 -
 azure/i386/job.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml
index 44b460ea24d..ed2c5d1128d 100644
--- a/azure/i386/apt.yml
+++ b/azure/i386/apt.yml
@@ -40,7 +40,6 @@ steps:
                               libpq-dev:i386 \
                               libreadline-dev:i386 \
                               libffi-dev:i386 \
-                              libfreetype6-dev:i386 \
                               libsodium-dev:i386 \
                               ${{ parameters.packages }}
     displayName: 'APT'
diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index 83e8705f0f2..203873e87cc 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -29,7 +29,6 @@ jobs:
             --enable-gd \
             --with-jpeg \
             --with-webp \
-            --with-freetype \
             --with-xpm \
             --enable-exif \
             --with-zip \