diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 33edc1551..002f0c443 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -91,6 +91,13 @@ if [ "$IS_64BIT" == "64" ];then OPTIONS="${OPTIONS} --with-libdir=lib64" fi + +argon_version=`pkg-config libargon2 --modversion` +if [ "$?" == "0" ];then + OPTIONS="${OPTIONS} --with-password-argon2" +fi + + ZIP_OPTION='--with-zip' libzip_version=`pkg-config libzip --modversion` if version_lt "$libzip_version" "0.11.0" ;then @@ -99,6 +106,7 @@ if version_lt "$libzip_version" "0.11.0" ;then ZIP_OPTION="--with-zip=$serverPath/lib/libzip" fi + # ----- cpu start ------ if [ -z "${cpuCore}" ]; then cpuCore="1" @@ -149,7 +157,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-sysvshm \ --disable-intl \ --disable-fileinfo \ - --with-password-argon2 \ $OPTIONS \ --enable-fpm make clean && make -j${cpuCore} && make install && make clean diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 649ac66a5..a36a53f51 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -84,6 +84,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +argon_version=`pkg-config libargon2 --modversion` +if [ "$?" == "0" ];then + OPTIONS="${OPTIONS} --with-password-argon2" +fi + ZIP_OPTION='--with-zip' libzip_version=`pkg-config libzip --modversion` if version_lt "$libzip_version" "0.11.0" ;then @@ -142,7 +147,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-sysvshm \ --disable-intl \ --disable-fileinfo \ - --with-password-argon2 \ $OPTIONS \ --enable-fpm make clean && make -j${cpuCore} && make install && make clean diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 4d9033237..fdf6978f1 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -86,6 +86,11 @@ if [ "$IS_64BIT" == "64" ];then OPTIONS="${OPTIONS} --with-libdir=lib64" fi +argon_version=`pkg-config libargon2 --modversion` +if [ "$?" == "0" ];then + OPTIONS="${OPTIONS} --with-password-argon2" +fi + # ----- cpu start ------ if [ -z "${cpuCore}" ]; then cpuCore="1" @@ -145,7 +150,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-sysvshm \ --disable-intl \ --disable-fileinfo \ - --with-password-argon2 \ $OPTIONS \ --enable-fpm make clean && make -j${cpuCore} && make install && make clean diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index 57ef5c78c..a047828a1 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -80,6 +80,11 @@ else OPTIONS="${OPTIONS} --with-curl" fi +argon_version=`pkg-config libargon2 --modversion` +if [ "$?" == "0" ];then + OPTIONS="${OPTIONS} --with-password-argon2" +fi + IS_64BIT=`getconf LONG_BIT` if [ "$IS_64BIT" == "64" ];then OPTIONS="${OPTIONS} --with-libdir=lib64" @@ -144,7 +149,6 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then --enable-sysvshm \ --disable-intl \ --disable-fileinfo \ - --with-password-argon2 \ $OPTIONS \ --enable-fpm make clean && make -j${cpuCore} && make install && make clean