From fa17a4848306c00697d3b1f21de0da70da14e1e4 Mon Sep 17 00:00:00 2001
From: jingjingxyk <zonghengbaihe521@qq.com>
Date: Sat, 1 Jul 2023 17:31:46 +0800
Subject: [PATCH] =?UTF-8?q?pgsql=20=20=E7=A6=81=E7=94=A8=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96libzstd=20icu=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/lib.json                             |  4 +---
 src/SPC/builder/unix/library/postgresql.php | 24 +++------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/config/lib.json b/config/lib.json
index 1d572794..40422539 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -388,11 +388,9 @@
         "lib-depends": [
             "libiconv",
             "libxml2",
-            "zstd",
             "openssl",
             "zlib",
-            "readline",
-            "icu"
+            "readline"
         ]
     },
     "pthreads4w": {
diff --git a/src/SPC/builder/unix/library/postgresql.php b/src/SPC/builder/unix/library/postgresql.php
index 7efa2559..056797e8 100644
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -20,7 +20,7 @@ trait postgresql
         $builddir = BUILD_ROOT_PATH;
         $env = $this->builder->configure_env;
         $envs = $env;
-        $packages = 'openssl zlib icu-uc icu-io icu-i18n readline libxml-2.0 libzstd';
+        $packages = 'openssl zlib  readline libxml-2.0 '; // icu-uc icu-io icu-i18n libzstd
 
         $output = shell()->execWithResult($env . ' pkg-config      --cflags-only-I   --static  ' . $packages);
         if (!empty($output[1][0])) {
@@ -30,7 +30,7 @@ trait postgresql
         $output = shell()->execWithResult($env . ' pkg-config      --libs-only-L   --static  ' . $packages);
         if (!empty($output[1][0])) {
             $ldflags = $output[1][0];
-            $envs .= " LDFLAGS=\"{$ldflags}\" ";
+            $envs .= " LDFLAGS=\"{$ldflags} -static\" ";
         }
         $output = shell()->execWithResult($env . ' pkg-config      --libs-only-l   --static  ' . $packages);
         if (!empty($output[1][0])) {
@@ -73,7 +73,7 @@ EOF
             --with-libxml  \\
             --without-libxslt \\
             --without-lz4 \\
-            --with-zstd \\
+            --without-zstd \\
             --without-perl \\
             --without-python \\
             --without-pam \\
@@ -91,24 +91,6 @@ EOF
         shell()->cd($this->source_dir . '/build')->exec($envs . ' make -C  src/backend/libpq install');
         shell()->cd($this->source_dir . '/build')->exec($envs . ' make -C  src/interfaces/libpq install');
 
-        /*
-           shell()->cd($this->source_dir . '/build')->exec(
-               <<<'EOF'
-               make -C src/bin/pg_config install
-               make -C src/include install
-
-               make -C  src/common install
-
-               make -C  src/backend/port install
-               make -C  src/port install
-
-               make -C  src/backend/libpq install
-               make -C  src/interfaces/libpq install
-
-   EOF
-           );
-       */
-
         shell()->cd($this->source_dir . '/build')->exec(
             <<<EOF
             rm -rf {$builddir}/lib/*.so.*