Improve library support when building from source

src/configs/darwin_libs

@@ -0,0 +1,22 @@
+amqp=rabbitmq-c
+decimal=mpdecimal
+ev=libev
+event=libevent
+geoip=geoip
+gmagick=graphicsmagick
+gnupg=gpgme
+grpc=grpc protobuf
+imagick=imagemagick
+memcached=libmemcached libevent
+protobuf=protobuf
+rdkafka=librdkafka
+snappy=snappy
+sodium=libsodium
+ssh2=libssh2
+uv=libuv
+uuid=util-linux
+vips=vips
+yaz=yaz
+yaml=libyaml
+zstd=zstd
+zmq=zeromq

src/configs/linux_libs

@@ -0,0 +1,22 @@
+amqp=librabbitmq-dev
+decimal=libmpdec-dev
+ev=libev-dev
+event=libevent-dev
+geoip=libgeoip-dev
+gmagick=graphicsmagick-libmagick-dev-compat
+gnupg=libgpgme-dev
+grpc=libgrpc-dev libprotobuf-dev protobuf-compiler
+imagick=libmagickwand-dev libmagickcore-dev
+memcached=libmemcached-dev libevent-dev
+protobuf=libprotobuf-dev protobuf-compiler
+rdkafka=librdkafka-dev
+snappy=libsnappy-dev
+sodium=libsodium-dev
+ssh2=libssh2-1-dev
+uv=libuv1-dev
+uuid=uuid-dev
+vips=libvips-dev
+yaz=libyaz-dev
+yaml=libyaml-dev
+zstd=libzstd-dev
+zmq=libzmq3-dev

src/scripts/extensions/patches/amqp.sh

@@ -0,0 +1,5 @@
+patch_amqp() {
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n amqp_connection_resource.c https://raw.githubusercontent.com/remicollet/php-amqp/977449987412a3d5c59a036dbab8b6d67764bb3e/amqp_connection_resource.c
+  fi
+}

src/scripts/extensions/patches/common.sh

@@ -1,12 +1,35 @@
-process_file() {
+patch_84() {
-    local file=$1
+  sed -i.bak \
-    sed -i'' -e '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//\#include <ext\/random\/php_random.h>/' "$file"
+    -e '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//#include <ext\/random\/php_random.h>/' \
-    sed -i'' -e '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' "$file"
+    -e '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' \
+    "$1" && rm -rf *.bak
 }
 
-export -f process_file
+patch_85() {
+  sed -i.bak \
+    -e 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#g' \
+    -e 's#ext/standard/php_smart_string_public.h#Zend/zend_smart_string.h#g' \
+    -e 's#zend_exception_get_default(TSRMLS_C)#zend_ce_exception#g' \
+    -e 's#zend_exception_get_default()#zend_ce_exception#g' \
+    "$1" && rm -rf *.bak
+}
 
-# Compare with 8.3 so it runs only on 8.4 and above
+version_ge() {
-if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
+  ver=$1
-  find . -type f \( -name "*.c" -o -name "*.h" \) -exec bash -c 'process_file "$0"' {} \;
+  min=$2
+  [[ $(printf '%s\n%s\n' "$ver" "$min" | sort -V | head -n1) == "$min" ]]
+}
+
+if version_ge "${version:?}" "8.4"; then
+  while IFS= read -r file; do
+    patch_84 "$file"
+  done < <(grep -rlE 'php_lcg\.h|php_mt_rand\.h|php_rand\.h|standard/php_random\.h' \
+           --include='*.c' --include='*.h' . || true)
+fi
+
+if version_ge "${version:?}" "8.5"; then
+  while IFS= read -r file; do
+    patch_85 "$file"
+  done < <(grep -rlE 'ext/standard/php_smart_string(_public)?\.h|zend_exception_get_default' \
+           --include='*.c' --include='*.h' . || true)
 fi

src/scripts/extensions/patches/gearman.sh

@@ -1,5 +0,0 @@
-patch_gearman() {
-  if [[ "${version:?}" =~ ${nightly_versions:?} ]]; then
-    sed -i~ -e "s/zend_exception_get_default()/zend_ce_exception/" php_gearman.c
-  fi
-}

src/scripts/extensions/patches/geos.sh

@@ -1,13 +1,10 @@
 patch_geos() {
-  php_version_id="$(php -r "echo PHP_VERSION_ID;")"
+  if [[ $(printf '%s\n%s\n' "${version:?}" "7.0" | sort -V | head -n1) == "7.0" ]]; then
-  if [ "$php_version_id" -ge 70000 ]; then
     sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
   fi
-  if [ "$php_version_id" -ge 80500 ]; then
-    sed -i~ -e "s/zend_exception_get_default(TSRMLS_C)/zend_ce_exception/" geos.c
-  fi
   get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
   get -q -n /tmp/toString.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0006-fix-__toString-with-8.2.patch
   patch -p1 < /tmp/php8.patch 2>/dev/null || true
   patch -p1 < /tmp/toString.patch 2>/dev/null || true
 }
+}

src/scripts/extensions/patches/pdo_oci.sh

@@ -1,5 +1,8 @@
 patch_pdo_oci() {
   get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n pdo_oci.c https://raw.githubusercontent.com/shivammathur/pecl-database-pdo_oci/a9cf2c53b6de46f9e5f523bcd11fd344e3beeb85/pdo_oci.c
+  fi
   if [[ ${version:?} =~ 5.[3-6] ]]; then
     sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
   fi

src/scripts/extensions/patches/pdo_sqlsrv.sh

@@ -0,0 +1,5 @@
+if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+  sed -i.bak -e 's/zval_ptr_dtor( &dbh->query_stmt_zval );/OBJ_RELEASE(dbh->query_stmt_obj);dbh->query_stmt_obj = NULL;/' php_pdo_sqlsrv_int.h
+  sed -i.bak -e 's/pdo_error_mode prev_err_mode/uint8_t prev_err_mode/g' pdo_dbh.cpp
+  rm -rf *.bak
+fi

src/scripts/extensions/source.sh

@@ -1,3 +1,7 @@
+os="$(uname -s)"
+os_lower=$(echo "$os" | tr '[:upper:]' '[:lower:]')
+os_capital=$(echo "$os" | tr '[:lower:]' '[:upper:]')
+
 # Function to parse extension environment variables
 parse_args() {
   local extension=${1%-*}
@@ -36,7 +40,7 @@ add_lib_log() {
 # Function to check if a library is installed
 check_lib() {
   local lib=$1
-  if [ "$(uname -s)" = "Linux" ]; then
+  if [ "$os" = "Linux" ]; then
     [ "x$(dpkg -s "$lib" 2>/dev/null | grep Status)" != "x" ]
   else
     [ "x$(find "${brew_prefix:?}"/Cellar -maxdepth 1 -name "$lib")" != "x" ]
@@ -68,7 +72,7 @@ add_darwin_libs() {
 add_libs() {
   local all_libs=("$@")
   for lib in "${all_libs[@]}"; do
-    if [ "$(uname -s)" = "Linux" ]; then
+    if [ "$os" = "Linux" ]; then
       add_linux_libs "$lib"
     else
       add_darwin_libs "$lib"
@@ -76,6 +80,19 @@ add_libs() {
   done
 }
 
+# Function to get required libraries for an extension
+get_libraries() {
+  local extension=$1
+  {
+    parse_args "$extension" LIBS
+    parse_args "$extension" "$os_capital"_LIBS
+    [ -r "${src:?}/configs/${os_lower}_libs" ] && \
+      grep -E "^[[:space:]]*${extension}[[:space:]]*=" "${src:?}/configs/${os_lower}_libs" | \
+      head -n1 | \
+      sed -E "s/^[[:space:]]*${extension}[[:space:]]*=[[:space:]]*//"
+  } | xargs -n 1 2>/dev/null | sort -u | xargs 2>/dev/null
+}
+
 # Function to run command in a group
 run_group() {
   local command=$1
@@ -137,7 +154,7 @@ add_extension_from_source() {
   local fetch=${7:-clone}
   slug="$extension-$release"
   source="$url/$org/$repo"
-  libraries="$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
+  libraries="$(get_libraries "$extension")"
   opts="$(parse_args "$extension" CONFIGURE_OPTS)"
   prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS)"
   suffix_opts="$(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"