From 1b88682fcbc6400afabce59f48e7179d5d6ef256 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 7 Jul 2022 05:24:37 +0000 Subject: [PATCH] add libiconv compiler --- docker/check-extensions.sh | 2 +- docker/compile-deps.sh | 14 +++++++++++++- docker/config.json | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/docker/check-extensions.sh b/docker/check-extensions.sh index b60d90f5..ded8c0c9 100755 --- a/docker/check-extensions.sh +++ b/docker/check-extensions.sh @@ -111,7 +111,7 @@ function check_in_configure() { 7.3.*|7.2.*) php_configure="$php_configure --enable-hash" ;; esac ;; - iconv) php_configure="$php_configure --with-iconv" ;; + iconv) php_configure="$php_configure --with-iconv=/usr" ;; inotify) php_configure="$php_configure --enable-inotify" ;; json) case $1 in diff --git a/docker/compile-deps.sh b/docker/compile-deps.sh index c2fd0806..39ee0f9a 100755 --- a/docker/compile-deps.sh +++ b/docker/compile-deps.sh @@ -43,8 +43,20 @@ function do_curl_compiler() { echo "curl compiled!" } +function do_iconv_compiler() { + cd $self_dir/source/libiconv-* && \ + ./configure --enable-static=yes --prefix=/usr && \ + make -j$(cat /proc/cpuinfo | grep processor | wc -l) && \ + make install && \ + echo "libiconv compiled!" +} + if [ ! -f "$self_dir/source/.deps-compiled" ]; then - do_xml_compiler && do_curl_compiler && do_libzip_compiler && touch "$self_dir/source/.deps-compiled" + do_xml_compiler && \ + do_curl_compiler && \ + do_libzip_compiler && \ + do_iconv_compiler && \ + touch "$self_dir/source/.deps-compiled" else echo "Skip compilation for dependencies" fi diff --git a/docker/config.json b/docker/config.json index f76ed57a..a1501baa 100755 --- a/docker/config.json +++ b/docker/config.json @@ -52,5 +52,10 @@ "version": "1.8.0", "link": "https://mirrors.zhamao.xin/library/libzip/libzip-{version}.tar.gz", "link_2": "https://libzip.org/download/libzip-{version}.tar.gz" + }, + "libiconv": { + "version": "1.17", + "link": "https://mirrors.zhamao.xin/library/libiconv/libiconv-{version}.tar.gz", + "link_2": "https://ftp.gnu.org/gnu/libiconv/libiconv-{version}.tar.gz" } }