diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-16 22:41:28 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-16 22:41:28 +0200 |
commit | d097dfca723596f944d61d9510310fa5140157c1 (patch) | |
tree | 077ee6560b125e0893921bc70876fd07d9295655 /azure/i386 | |
parent | a69d9f2039b2558e1f098962f13749eefd59caf8 (diff) | |
parent | bc6979b79e1ee9b7de7efa84a938a8be49f91276 (diff) | |
download | php-git-d097dfca723596f944d61d9510310fa5140157c1.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Drop freetype from i386"
Diffstat (limited to 'azure/i386')
-rw-r--r-- | azure/i386/apt.yml | 1 | ||||
-rw-r--r-- | azure/i386/job.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml index 590baa2262..4dd09423c9 100644 --- a/azure/i386/apt.yml +++ b/azure/i386/apt.yml @@ -40,6 +40,7 @@ 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 6035f7c7d5..ec1b118aa3 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -29,6 +29,7 @@ jobs: --enable-gd \ --with-jpeg \ --with-webp \ + --with-freetype \ --with-xpm \ --enable-exif \ --with-zip \ |