update

plugins/php/versions/54/install.sh

@@ -7,13 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
 
 
 Install_php()
@@ -32,13 +28,19 @@ if [ ! -d $sourcePath/php/php-5.4.45 ];then
 fi
 
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 cd $sourcePath/php/php-5.4.45 && ./configure \
 --prefix=$serverPath/php/54 \
 --exec-prefix=$serverPath/php/54 \
 --with-config-file-path=$serverPath/php/54/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-sockets \
@@ -49,6 +51,7 @@ cd $sourcePath/php/php-5.4.45 && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean
 

plugins/php/versions/55/install.sh

@@ -7,15 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
-
-
 Install_php()
 {
 #------------------------ install start ------------------------------------#
@@ -31,6 +25,13 @@ if [ ! -d $sourcePath/php/php-5.5.38 ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-5.5.38.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 
 cd $sourcePath/php/php-5.5.38 && ./configure \
 --prefix=$serverPath/php/55 \
@@ -38,7 +39,6 @@ cd $sourcePath/php/php-5.5.38 && ./configure \
 --with-config-file-path=$serverPath/php/55/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-intl \
 --enable-mbstring \
@@ -50,6 +50,7 @@ cd $sourcePath/php/php-5.5.38 && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean
 

plugins/php/versions/56/install.sh

@@ -7,14 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
-
 
 Install_php()
 {
@@ -31,6 +26,12 @@ if [ ! -d $sourcePath/php/php-5.6.36 ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-5.6.36.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
 
 cd $sourcePath/php/php-5.6.36 && ./configure \
 --prefix=$serverPath/php/56 \
@@ -40,7 +41,6 @@ cd $sourcePath/php/php-5.6.36 && ./configure \
 --with-mysql=mysqlnd \
 --with-pdo-mysql=mysqlnd \
 --with-mysqli=mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-intl \
@@ -48,13 +48,14 @@ cd $sourcePath/php/php-5.6.36 && ./configure \
 --enable-sockets \
 --enable-pcntl \
 --enable-shmop \
---enable-sysvmsg \
---enable-sysvsem \
---enable-sysvshm \
 --enable-intl \
 --enable-wddx \
 --enable-soap \
 --enable-posix \
+--enable-sysvmsg \
+--enable-sysvsem \
+--enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make clean && make && make install && make clean
 

plugins/php/versions/70/install.sh

@@ -7,14 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
-
 
 Install_php()
 {
@@ -31,6 +26,13 @@ if [ ! -d $sourcePath/php/php-7.0.30 ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-7.0.30.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 
 cd $sourcePath/php/php-7.0.30 && ./configure \
 --prefix=$serverPath/php/70 \
@@ -38,7 +40,6 @@ cd $sourcePath/php/php-7.0.30 && ./configure \
 --with-config-file-path=$serverPath/php/70/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-ftp \
@@ -50,6 +51,7 @@ cd $sourcePath/php/php-7.0.30 && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean
 

plugins/php/versions/71/install.sh

@@ -7,14 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
-
 version=7.1.27
 Install_php()
 {
@@ -31,6 +26,13 @@ if [ ! -d $sourcePath/php/php-${version} ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 
 cd $sourcePath/php/php-${version} && ./configure \
 --prefix=$serverPath/php/71 \
@@ -38,7 +40,6 @@ cd $sourcePath/php/php-${version} && ./configure \
 --with-config-file-path=$serverPath/php/71/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-ftp \
@@ -50,6 +51,7 @@ cd $sourcePath/php/php-${version} && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean
 

plugins/php/versions/72/install.sh

@@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
 
@@ -27,6 +27,13 @@ if [ ! -d $sourcePath/php/php-${version} ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 
 cd $sourcePath/php/php-${version} && ./configure \
 --prefix=$serverPath/php/72 \
@@ -34,7 +41,6 @@ cd $sourcePath/php/php-${version} && ./configure \
 --with-config-file-path=$serverPath/php/72/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-sockets \
@@ -46,6 +52,7 @@ cd $sourcePath/php/php-${version} && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean
 

plugins/php/versions/73/install.sh

@@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
 
@@ -28,13 +28,20 @@ if [ ! -d $sourcePath/php/php-${version} ];then
 fi
 
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
+
 cd $sourcePath/php/php-${version} && ./configure \
 --prefix=$serverPath/php/73 \
 --exec-prefix=$serverPath/php/73 \
 --with-config-file-path=$serverPath/php/73/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-mbstring \
 --enable-ftp \
@@ -46,6 +53,7 @@ cd $sourcePath/php/php-${version} && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean