Merge branch 'experiment-webui' into experiment_v4.8.x

swoole · Jul 28, 2023 · a28c6ae · a28c6ae
2 parents 64e89ca + 5db0734
commit a28c6ae
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/sapi/src/builder/library/freetype.php b/sapi/src/builder/library/freetype.php
@@ -19,14 +19,16 @@
             ->withConfigure(
                 <<<EOF
             ./configure --help
+            PACKAGES='zlib libpng  libbrotlicommon  libbrotlienc libbrotlidec '
             BZIP2_CFLAGS="-I{$bzip2_prefix}/include"  \
             BZIP2_LIBS="-L{$bzip2_prefix}/lib -lbz2"  \
-            CPPFLAGS="$(pkg-config --cflags-only-I --static zlib libpng  libbrotlicommon  libbrotlidec  libbrotlienc)" \
-            LDFLAGS="$(pkg-config  --libs-only-L   --static zlib libpng  libbrotlicommon  libbrotlidec  libbrotlienc)" \
-            LIBS="$(pkg-config     --libs-only-l   --static zlib libpng  libbrotlicommon  libbrotlidec  libbrotlienc)" \
-            ./configure --prefix={$freetype_prefix} \
-            --enable-static \
-            --disable-shared \
+            CPPFLAGS="$(pkg-config --cflags-only-I --static \$PACKAGES)" \
+            LDFLAGS="$(pkg-config  --libs-only-L   --static \$PACKAGES)" \
+            LIBS="$(pkg-config     --libs-only-l   --static \$PACKAGES)" \
+            ./configure \
+            --prefix={$freetype_prefix} \
+            --enable-shared=no \
+            --enable-static=yes \
             --with-zlib=yes \
             --with-bzip2=yes \
             --with-png=yes \