Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Update libzip on macos"
  Revert "Manually build re2c on macos"

Author: nikic

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 [email protected] \
@@ -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'