diff --git a/sapi/src/builder/library/freetype.php b/sapi/src/builder/library/freetype.php
index 6d3398244d..02827c8ea9 100644
--- 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 \
diff --git a/sapi/src/builder/library/pgsql.php b/sapi/src/builder/library/pgsql.php
index 709151a8b2..c8ab8296d8 100644
--- a/sapi/src/builder/library/pgsql.php
+++ b/sapi/src/builder/library/pgsql.php
@@ -6,7 +6,9 @@
 return function (Preprocessor $p) {
     $pgsql_prefix = PGSQL_PREFIX;
     $option = '';
+
     $ldflags = $p->getOsType() == 'macos' ? '' : ' -static ';
+
     if ($p->getOsType() == 'macos') {
         $option = '--disable-thread-safety';
     }