From 34a91f09349061065c2ff139ff4dbc83b5f904f0 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 22 Nov 2019 13:24:14 +0800 Subject: [PATCH] up --- plugins/php/versions/53/install.sh | 2 ++ plugins/php/versions/54/install.sh | 2 ++ plugins/php/versions/55/install.sh | 1 + plugins/php/versions/56/install.sh | 2 ++ 4 files changed, 7 insertions(+) diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 0743bf6bf..08b7ab2b1 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -43,9 +43,11 @@ fi OPTIONS='' if [ $sysName == 'Darwin' ]; then OPTIONS='--without-iconv' + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index b43c08b6c..9d09455f8 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -31,9 +31,11 @@ fi OPTIONS='' if [ $sysName == 'Darwin' ]; then OPTIONS='--without-iconv' + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 68d975603..457474e64 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -28,6 +28,7 @@ fi OPTIONS='' if [ $sysName == 'Darwin' ]; then OPTIONS='--without-iconv' + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 365ec2821..f37b8d504 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -29,9 +29,11 @@ fi OPTIONS='' if [ $sysName == 'Darwin' ]; then OPTIONS='--without-iconv' + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" + OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" OPTIONS="${OPTIONS} --with-curl" fi