diff --git a/plugins/php/versions/common/gd.sh b/plugins/php/versions/common/gd.sh index 8c97fab04..d5cb9f3b4 100755 --- a/plugins/php/versions/common/gd.sh +++ b/plugins/php/versions/common/gd.sh @@ -23,7 +23,14 @@ OSNAME=`cat ${rootPath}/data/osname.pl` OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'` -if [ "centos" == "$OSNAME" ] && [ "$OSNAME_ID" != "9" ];then +if [ "centos" == "$OSNAME" ]; then + if [ "$OSNAME_ID" != "9" ];then + if [ "$version" -lt "74" ];then + bash $curPath/gd_old.sh $1 $2 + exit 0 + fi + fi +else if [ "$version" -lt "74" ];then bash $curPath/gd_old.sh $1 $2 exit 0 @@ -67,11 +74,12 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --enable-gd \ + --enable-gd-jis-conv \ --with-webp \ --with-xpm \ --with-jpeg \ - --with-freetype \ - --enable-gd-jis-conv + --with-freetype + make clean && make && make install && make clean diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index 844c53dc7..20245af2d 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -81,8 +81,8 @@ Install_lib() --with-gd \ --with-jpeg-dir \ --with-freetype-dir=${serverPath}/lib/freetype_old \ - --enable-gd-jis-conv \ - --enable-gd-native-ttf + --enable-gd-jis-conv + # --enable-gd-native-ttf make clean && make && make install && make clean fi