diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-08 10:28:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-08 10:28:07 +0200 |
| commit | 382cb2e77953c4f7931eb5b0fe7cf0b15d27fd0f (patch) | |
| tree | 3cd87cc82ffb40c6e49d3fc74656b8dcbf2d7c65 /azure | |
| parent | d30a648bc81d3561c719584eec2df6c1f4d46d7b (diff) | |
| parent | 5a201ddad0cf655e1d07e720200ae425166d0a6d (diff) | |
| download | php-git-382cb2e77953c4f7931eb5b0fe7cf0b15d27fd0f.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Update libzip on macos"
Revert "Manually build re2c on macos"
Diffstat (limited to 'azure')
| -rw-r--r-- | azure/macos/brew.yml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/azure/macos/brew.yml b/azure/macos/brew.yml index fb8b9ace2d..df4c5a532d 100644 --- a/azure/macos/brew.yml +++ b/azure/macos/brew.yml @@ -2,12 +2,11 @@ parameters: packages: '' steps: - - script: brew update - displayName: 'Update Homebrew' - script: | brew install pkg-config \ autoconf \ - bison + bison \ + re2c displayName: 'Install Build Tools' - script: | brew install openssl@1.1 \ @@ -24,20 +23,11 @@ steps: zlib \ t1lib \ gd \ + libzip \ gmp \ tidyp \ libxml2 \ libxslt \ postgresql - # Make sure we don't get broken libzip 1.7.0 - brew upgrade libzip brew link icu4c gettext --force displayName: 'Install Build Dependencies' - - script: | - wget https://github.com/skvadrik/re2c/releases/download/2.0.1/re2c-2.0.1.tar.xz - tar -xf re2c-2.0.1.tar.xz - cd re2c-2.0.1 - ./configure - make -j$(sysctl -n hw.ncpu) - make install - displayName: 'Build re2c' |