Merge pull request #75 from manticoresoftware/update/add_ext_iconv

Added iconv extension to fix issues with newer symfony/polyfill-mbstr…

Author: Nick-S-2018

README.md

@@ -38,6 +38,7 @@ We build executor from `PHP 8.4.2` with the following extensions enabled and com
 * openssl
 * zlib
 * mbstring
+* iconv
 
 ## Build from source
 

build-alpine

@@ -22,7 +22,7 @@ install_deps() {
     ln -s /usr/bin/objcopy "/usr/bin/${arch}-alpine-linux-musl-objcopy"
   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
+  apk add curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev gnu-libiconv-dev
 
   install_curl
 
@@ -70,6 +70,7 @@ ENABLE_STATIC=yes
   --enable-sysvsem \
 	--with-mysqli \
 	--enable-mysqlnd \
+  --with-iconv \
   "${BUILD_EXTRA[@]}"
 
 fix_static_linking

build-linux

@@ -17,7 +17,7 @@ set -xe
 
 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 libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev librdkafka-dev
+  sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev librdkafka-dev libiconv-hook-dev
 }
 
 install_dev_deps() {
@@ -47,7 +47,7 @@ ENABLE_STATIC=yes
   --with-rdkafka \
 	--enable-jchash \
 	--enable-simdjson \
-  --with-openssl --with-zlib --with-zip \
+  --with-openssl --with-zlib --with-zip --with-iconv \
   --enable-filter \
   --with-curl \
   --enable-mbstring \

build-osx

@@ -8,16 +8,17 @@
 
 set -e
 install_deps() {
-  brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka
+  brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka libiconv
 
   OPENSSL_PREFIX="$(brew --prefix openssl)"
   LIBRDKAFKA_PREFIX="$(brew --prefix librdkafka)"
+  ICONV_PREFIX="$(brew --prefix libiconv)"
   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}/lib -L${LIBRDKAFKA_PREFIX}/lib"
-  export CPPFLAGS="-I${OPENSSL_PREFIX}/include -I${LIBRDKAFKA_PREFIX}/include"
+  export LDFLAGS="-L${OPENSSL_PREFIX}/lib -L${LIBRDKAFKA_PREFIX}/lib -L${ICONV_PREFIX}/lib"
+  export CPPFLAGS="-I${OPENSSL_PREFIX}/include -I${LIBRDKAFKA_PREFIX}/include -I${ICONV_PREFIX}/include"
 
   export PKG_CONFIG_PATH="${OPENSSL_PREFIX}/lib/pkgconfig"
 }
@@ -94,7 +95,7 @@ chmod +x configure
   --with-rdkafka \
 	--enable-jchash \
 	--enable-simdjson \
-  --with-openssl --with-zlib --with-zip \
+  --with-openssl --with-zlib --with-zip --with-iconv=$(brew --prefix libiconv) \
   --enable-filter \
   --with-curl \
   --enable-opcache \