diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index ad227d789..f202839db 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -120,6 +120,12 @@ else fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + + if [ ! -d $serverPath/php/${PHP_VER} ];then export MYSQL_LIB_DIR=/usr/lib64/mysql diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 58bbe27b4..2edbaa280 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -51,6 +51,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/53/bin ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index 1fc23cfce..f3735b430 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -43,6 +43,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/${PHP_VER} ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 1d171d275..7594d38be 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -42,6 +42,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/55 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ --prefix=$serverPath/php/55 \ diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index cadfffe39..a0a262fe1 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -42,6 +42,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/56 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 8ab98b059..b7f134955 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -42,6 +42,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/70 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ --prefix=$serverPath/php/70 \ diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index d9fc1d99f..32d3fc814 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -41,6 +41,10 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi if [ ! -d $serverPath/php/71 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index 1d358ec7a..4ed39b4e0 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -42,6 +42,10 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi if [ ! -d $serverPath/php/72 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index 21f742e8d..5cb225412 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -47,6 +47,11 @@ else OPTIONS="${OPTIONS} --with-libzip=${serverPath}/lib/libzip" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + if [ ! -d $serverPath/php/73 ];then cd $sourcePath/php/php${PHP_VER} && ./configure \ diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index a111ad05a..d491dc538 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -35,6 +35,8 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER} fi + + cd $sourcePath/php/php${PHP_VER} OPTIONS='' @@ -52,7 +54,10 @@ else OPTIONS="${OPTIONS} --with-curl" fi - +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi echo "$sourcePath/php/php${PHP_VER}" diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 38dcd912e..e0040e076 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -52,6 +52,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi + echo "$sourcePath/php/php${PHP_VER}" if [ ! -d $serverPath/php/${PHP_VER} ];then diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 6ceed4984..3b644d6e1 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -50,6 +50,10 @@ else OPTIONS="${OPTIONS} --with-libzip=${serverPath}/lib/libzip" fi +IS_64BIT=`getconf LONG_BIT` +if [ "$IS_64BIT" == "64" ];then + OPTIONS="${OPTIONS} --with-libdir=lib64" +fi echo "$sourcePath/php/php${PHP_VER}" diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index cb9429235..2cf9a3e68 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -115,7 +115,7 @@ yum install -y ncurses-devel yum install -y vixie-cron -for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel gd gd-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper crontabs expat-devel readline-devel; +for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel gd gd-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper expat-devel readline-devel; do yum -y install $yumPack;done @@ -125,6 +125,7 @@ if [ "$VERSION_ID" -eq "9" ];then dnf --enablerepo=crb install -y libmemcached-devel dnf --enablerepo=crb install -y libtool libtool-libs dnf --enablerepo=crb install -y gnutls-devel + dnf --enablerepo=crb install -y mysql-devel # yum remove -y chardet fi