Use system curl for osx

Author: donhardman

build-alpine

@@ -21,6 +21,14 @@ install_deps() {
   export CROSS_COMPILE="/usr/bin/${arch}-alpine-linux-musl-"
 
   apk add curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev
+
+  # Build curl
+  curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
+  cd curl-8.0.0
+  ./configure --disable-shared --with-ssl --without-libidn2
+  make -j8
+  make install
+  cd ..
 }
 
 install_dev_deps() {

build-bash-base.sh

@@ -32,14 +32,6 @@ curl -sSL "https://github.com/php/php-src/archive/refs/tags/php-$PHP_VERSION.tar
 test -d build && rm -fr "$_"
 mv "php-src-php-$PHP_VERSION" build && cd "$_"
 
-# Build curl
-curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
-cd curl-8.0.0
-./configure --disable-shared --with-ssl --without-libidn2
-make -j8
-make install
-cd ..
-
 # Build extra extensions
 cd ext
 

build-linux

@@ -12,6 +12,14 @@ set -e
 install_deps() {
   sudo apt-get update -y
   sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libonig-dev cmake
+
+  # Build curl
+  curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
+  cd curl-8.0.0
+  ./configure --disable-shared --with-ssl --without-libidn2
+  make -j8
+  sudo make install
+  cd ..
 }
 
 install_dev_deps() {
@@ -42,6 +50,7 @@ fi
   --enable-zts --enable-parallel \
   --with-openssl --with-zlib \
   --enable-filter \
+  --with-curl \
   --enable-mbstring \
   "${BUILD_EXTRA[@]}"
 

build-osx

@@ -9,7 +9,16 @@
 set -e
 install_deps() {
   brew upgrade
-  brew install curl autoconf automake bison re2c zstd git openssl zlib cmake libcurl
+  brew install curl autoconf automake bison re2c zstd git openssl zlib cmake
+
+  OPENSSL_PREFIX="$(brew --prefix openssl)"
+  OPENSSL_CFLAGS="-I${OPENSSL_PREFIX}/include"
+  OPENSSL_LIBS="-L${OPENSSL_PREFIX}/lib -lcrypto -lssl"
+  export OPENSSL_PREFIX OPENSSL_CFLAGS OPENSSL_LIBS
+  export PATH="${OPENSSL_PREFIX}/bin:${PATH}"
+  export LDFLAGS="-L${OPENSSL_PREFIX}@1.1/lib"
+  export CPPFLAGS="-I${OPENSSL_PREFIX}/include"
+  export PKG_CONFIG_PATH="${OPENSSL_PREFIX}/lib/pkgconfig"
 }
 
 install_dev_deps() {
@@ -19,14 +28,6 @@ install_dev_deps() {
 export -f install_deps install_dev_deps
 . ./build-bash-base.sh "$@"
 
-if which brew; then
-  brew link openssl@1.1
-  OPENSSL_PREFIX="$(brew --prefix openssl@1.1)"
-  OPENSSL_CFLAGS="-I${OPENSSL_PREFIX}/include"
-  OPENSSL_LIBS="-L${OPENSSL_PREFIX}/lib -lcrypto -lssl"
-  export OPENSSL_PREFIX OPENSSL_CFLAGS OPENSSL_LIBS
-fi
-
 hide_dynamic_libs() {
   ! which brew && return
   for lib in "$@"; do