Multiple release bug fix

README-zh.md

@@ -14,10 +14,10 @@ Build single static PHP binary, with PHP project together, with popular extensio
 
 > 该 SAPI 源自 [dixyes/phpmicro](https://github.com/dixyes/phpmicro) 的 [Fork 仓库](https://github.com/static-php/phpmicro)。
 
-[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
+[![Version](https://img.shields.io/badge/Version-2.0.0-green.svg?style=flat-square)]()
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
-[![](https://img.shields.io/github/actions/workflow/status/static-php/static-php-cli-hosted/build-php-common.yml?branch=refactor&label=Build%20Common%20Extensions&style=flat-square)](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-common.yml)
-[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]()
+[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+[![](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)]()
 [![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
 
 > 项目名称是 static-php-cli，但其实支持 cli、fpm、micro 和 embed SAPI 😎

README.md

@@ -18,11 +18,10 @@ You can also use the micro binary file to combine php binary and php source code
 
 > This SAPI feature is from the [Fork](https://github.com/static-php/phpmicro) of [dixyes/phpmicro](https://github.com/dixyes/phpmicro).
 
-[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
+[![Version](https://img.shields.io/badge/Version-2.0.0-green.svg?style=flat-square)]()
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
 [![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
-
-[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]([https://static-php.dev/](https://static-php.dev/en/guide/extensions.html))
+[![](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)]([https://static-php.dev/](https://static-php.dev/en/guide/extensions.html))
 [![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
 
 ## Documentation

config/lib.json

@@ -2,14 +2,14 @@
     "brotli": {
         "source": "brotli",
         "static-libs-unix": [
-            "libbrotlidec-static.a",
-            "libbrotlienc-static.a",
-            "libbrotlicommon-static.a"
+            "libbrotlidec.a",
+            "libbrotlienc.a",
+            "libbrotlicommon.a"
         ],
         "static-libs-windows": [
-            "brotlicommon-static.lib",
-            "brotlienc-static.lib",
-            "brotlidec-static.lib"
+            "brotlicommon.lib",
+            "brotlienc.lib",
+            "brotlidec.lib"
         ],
         "headers": [
             "brotli"

src/SPC/builder/extension/ldap.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('ldap')]
+class ldap extends Extension
+{
+    public function patchBeforeConfigure(): bool
+    {
+        $output = shell()->execWithResult('$PKG_CONFIG --libs-only-l --static ldap');
+        if (!empty($output[1][0])) {
+            $libs = $output[1][0];
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lldap ', $libs . ' ');
+        }
+        return true;
+    }
+}

src/SPC/builder/unix/library/brotli.php

@@ -27,11 +27,7 @@ protected function build(): void
             ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']);
-        shell()->cd(BUILD_ROOT_PATH . '/lib')
-            ->exec('cp libbrotlicommon.a libbrotlicommon-static.a')
-            ->exec('ln -sf libbrotlicommon.a libbrotli.a')
-            ->exec('cp libbrotlidec.a libbrotlidec-static.a')
-            ->exec('cp libbrotlienc.a libbrotlienc-static.a');
+        shell()->cd(BUILD_ROOT_PATH . '/lib')->exec('ln -sf libbrotlicommon.a libbrotli.a');
         foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
             if (str_starts_with($filename, 'libbrotli') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                 unlink(BUILD_ROOT_PATH . '/lib/' . $filename);

src/SPC/builder/unix/library/ldap.php

@@ -4,17 +4,25 @@
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
+
 trait ldap
 {
+    public function patchBeforeBuild(): bool
+    {
+        FileSystem::replaceFileStr($this->source_dir . '/configure', '"-lssl -lcrypto', '"-lssl -lcrypto -lz');
+        return true;
+    }
+
     protected function build(): void
     {
         $alt = '';
         // openssl support
-        $alt .= $this->builder->getLib('openssl') && $this->builder->getExt('zlib') ? '--with-tls=openssl ' : '';
+        $alt .= $this->builder->getLib('openssl') ? '--with-tls=openssl ' : '';
         // gmp support
         $alt .= $this->builder->getLib('gmp') ? '--with-mp=gmp ' : '';
         // libsodium support
-        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '';
+        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '--enable-argon2=no ';
         f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
         f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
         shell()->cd($this->source_dir)
@@ -24,7 +32,6 @@ protected function build(): void
                 '--enable-static ' .
                 '--disable-shared ' .
                 '--disable-slapd ' .
-                '--disable-slurpd ' .
                 '--without-systemd ' .
                 '--without-cyrus-sasl ' .
                 $alt .

src/SPC/command/BuildLibsCommand.php

@@ -7,6 +7,7 @@
 use SPC\builder\BuilderProvider;
 use SPC\exception\ExceptionHandler;
 use SPC\exception\RuntimeException;
+use SPC\util\DependencyUtil;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -59,6 +60,7 @@ public function handle(): int
             // 只编译 library 的情况下，标记
             $builder->setLibsOnly();
             // 编译和检查库完整
+            $libraries = DependencyUtil::getLibsByDeps($libraries);
             $builder->buildLibs($libraries);
 
             $time = round(microtime(true) - START_TIME, 3);

src/globals/test-extensions.php

@@ -17,7 +17,7 @@
 
 // Please change your test base combination. We recommend testing with `common`.
 // You can use `common`, `bulk`, `minimal` or `none`.
-$base_combination = 'common';
+$base_combination = 'minimal';
 
 // -------------------------- code area, do not modify --------------------------