diff --git a/plugins/php/lib/icu.sh b/plugins/php/lib/icu.sh index 7c8c039c7..b635f5ff8 100644 --- a/plugins/php/lib/icu.sh +++ b/plugins/php/lib/icu.sh @@ -44,7 +44,7 @@ if [ ! -d ${SERVER_ROOT}/icu ];then # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib if [ -d /etc/ld.so.conf.d ];then echo "/www/server/lib/icu/lib" > /etc/ld.so.conf.d/mw-icu.conf - elif [[ -f /etc/ld.so.conf ]]; then + elif [ -f /etc/ld.so.conf ]; then echo "/www/server/lib/icu/lib" >> /etc/ld.so.conf fi diff --git a/plugins/php/lib/openssl_10.sh b/plugins/php/lib/openssl_10.sh index 24064ebad..5de05cdf9 100644 --- a/plugins/php/lib/openssl_10.sh +++ b/plugins/php/lib/openssl_10.sh @@ -44,6 +44,15 @@ if [ ! -d ${SERVER_ROOT}/openssl10 ];then ./config --openssldir=${SERVER_ROOT}/openssl10 zlib-dynamic shared make && make install + # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/openssl10/lib + if [ -d /etc/ld.so.conf.d ];then + echo "/www/server/lib/openssl10/lib" > /etc/ld.so.conf.d/openssl10.conf + elif [ -f /etc/ld.so.conf ]; then + echo "/www/server/lib/openssl10/lib" >> /etc/ld.so.conf + fi + + ldconfig + cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/openssl-${opensslVersion} fi diff --git a/plugins/php/lib/openssl_11.sh b/plugins/php/lib/openssl_11.sh index 4124b356a..80a3f3473 100644 --- a/plugins/php/lib/openssl_11.sh +++ b/plugins/php/lib/openssl_11.sh @@ -24,6 +24,15 @@ if [ ! -d ${SERVER_ROOT}/openssl11 ];then ./config --prefix=${SERVER_ROOT}/openssl11 zlib-dynamic shared make && make install + # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/openssl11/lib + if [ -d /etc/ld.so.conf.d ];then + echo "/www/server/lib/openssl11/lib" > /etc/ld.so.conf.d/openssl11.conf + elif [ -f /etc/ld.so.conf ]; then + echo "/www/server/lib/openssl11/lib" >> /etc/ld.so.conf + fi + + ldconfig + cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/openssl-${opensslVersion} fi diff --git a/plugins/php/lib/openssl_30.sh b/plugins/php/lib/openssl_30.sh index 32e151fcd..fe7d92659 100644 --- a/plugins/php/lib/openssl_30.sh +++ b/plugins/php/lib/openssl_30.sh @@ -25,6 +25,16 @@ if [ ! -d ${SERVER_ROOT}/openssl30 ];then ./config --prefix=${SERVER_ROOT}/openssl30 zlib-dynamic shared make && make install + + # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/openssl30/lib + if [ -d /etc/ld.so.conf.d ];then + echo "/www/server/lib/openssl30/lib" > /etc/ld.so.conf.d/openssl30.conf + elif [ -f /etc/ld.so.conf ]; then + echo "/www/server/lib/openssl30/lib" >> /etc/ld.so.conf + fi + + ldconfig + cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/openssl-${opensslVersion} fi