Browse Source

[fix] Update php-8.0

lj2007331@gmail.com 4 years ago
parent
commit
f0b81a9b72
2 changed files with 5 additions and 4 deletions
  1. 4 3
      include/php-8.0.sh
  2. 1 1
      versions.txt

+ 4 - 3
include/php-8.0.sh

@@ -21,6 +21,7 @@ Install_PHP80() {
     make -j ${THREAD} && make install
     make -j ${THREAD} && make install
     popd > /dev/null
     popd > /dev/null
     rm -rf libiconv-${libiconv_ver}
     rm -rf libiconv-${libiconv_ver}
+    ln -s ${libiconv_install_dir}/lib/libiconv.so.2 /usr/lib64/libiconv.so.2
   fi
   fi
 
 
   if [ ! -e "${curl_install_dir}/lib/libcurl.la" ]; then
   if [ ! -e "${curl_install_dir}/lib/libcurl.la" ]; then
@@ -108,7 +109,7 @@ Install_PHP80() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-apxs2=${apache_install_dir}/bin/apxs ${phpcache_arg} --disable-fileinfo \
     --with-apxs2=${apache_install_dir}/bin/apxs ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
+    --with-iconv --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
@@ -119,14 +120,14 @@ Install_PHP80() {
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-config-file-scan-dir=${php_install_dir}/etc/php.d \
     --with-fpm-user=${run_user} --with-fpm-group=${run_group} --enable-fpm ${phpcache_arg} --disable-fileinfo \
     --with-fpm-user=${run_user} --with-fpm-group=${run_group} --enable-fpm ${phpcache_arg} --disable-fileinfo \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
     --enable-mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd \
-    --with-iconv=${libiconv_install_dir} --with-freetype --with-jpeg --with-zlib \
+    --with-iconv --with-freetype --with-jpeg --with-zlib \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-xml --disable-rpath --enable-bcmath --enable-shmop --enable-exif \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-sysvsem --with-curl=${curl_install_dir} --enable-mbregex \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --enable-mbstring --with-password-argon2 --with-sodium=/usr/local --enable-gd --with-openssl=${openssl_install_dir} \
     --with-mhash --enable-pcntl --enable-sockets --enable-ftp --enable-intl --with-xsl \
     --with-mhash --enable-pcntl --enable-sockets --enable-ftp --enable-intl --with-xsl \
     --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
     --with-gettext --with-zip=/usr/local --enable-soap --disable-debug ${php_modules_options}
   fi
   fi
-  make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
+  make ZEND_EXTRA_LIBS="-L${libiconv_install_dir}/lib/ -liconv" -j ${THREAD}
   make install
   make install
 
 
   if [ -e "${php_install_dir}/bin/phpize" ]; then
   if [ -e "${php_install_dir}/bin/phpize" ]; then

+ 1 - 1
versions.txt

@@ -68,7 +68,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 libzip_ver=1.2.0
 argon2_ver=20171227
 argon2_ver=20171227
-imagemagick_ver=7.0.10-52
+imagemagick_ver=7.0.10-53
 imagick_ver=3.4.4
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.35
 graphicsmagick_ver=1.3.35
 gmagick_ver=2.0.5RC1
 gmagick_ver=2.0.5RC1