Merge pull request #748 from crazywhalecc/feat/h3

simplify makeAutoConfArgs, fix macOS differences

Author: henderkes

src/SPC/builder/linux/LinuxBuilder.php

@@ -4,7 +4,6 @@
 
 namespace SPC\builder\linux;
 
-use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -70,35 +69,6 @@ public function __construct(array $options = [])
         f_mkdir(BUILD_INCLUDE_PATH, recursive: true);
     }
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
-    public function makeAutoconfArgs(string $name, array $libSpecs): string
-    {
-        $ret = '';
-        foreach ($libSpecs as $libName => $arr) {
-            $lib = $this->getLib($libName);
-            if ($lib === null && str_starts_with($libName, 'lib')) {
-                $lib = $this->getLib(substr($libName, 3));
-            }
-
-            $arr = $arr ?? [];
-
-            $disableArgs = $arr[0] ?? null;
-            $prefix = $arr[1] ?? null;
-            if ($lib instanceof LinuxLibraryBase) {
-                logger()->info("{$name} \033[32;1mwith\033[0;1m {$libName} support");
-                $ret .= $lib->makeAutoconfEnv($prefix) . ' ';
-            } else {
-                logger()->info("{$name} \033[31;1mwithout\033[0;1m {$libName} support");
-                $ret .= ($disableArgs ?? "--with-{$libName}=no") . ' ';
-            }
-        }
-        return rtrim($ret);
-    }
-
     /**
      * Build PHP from source.
      *

src/SPC/builder/macos/MacOSBuilder.php

@@ -44,35 +44,6 @@ public function __construct(array $options = [])
         f_mkdir(BUILD_INCLUDE_PATH, recursive: true);
     }
 
-    /**
-     * [deprecated] 生成库构建采用的 autoconf 参数列表
-     *
-     * @param string $name      要构建的 lib 库名，传入仅供输出日志
-     * @param array  $lib_specs 依赖的 lib 库的 autoconf 文件
-     */
-    public function makeAutoconfArgs(string $name, array $lib_specs): string
-    {
-        $ret = '';
-        foreach ($lib_specs as $libName => $arr) {
-            $lib = $this->getLib($libName);
-            if ($lib === null && str_starts_with($libName, 'lib')) {
-                $lib = $this->getLib(substr($libName, 3));
-            }
-
-            $arr = $arr ?? [];
-
-            $disableArgs = $arr[0] ?? null;
-            if ($lib instanceof MacOSLibraryBase) {
-                logger()->info("{$name} \033[32;1mwith\033[0;1m {$libName} support");
-                $ret .= '--with-' . $libName . '=yes ';
-            } else {
-                logger()->info("{$name} \033[31;1mwithout\033[0;1m {$libName} support");
-                $ret .= ($disableArgs ?? "--with-{$libName}=no") . ' ';
-            }
-        }
-        return rtrim($ret);
-    }
-
     /**
      * Get dynamically linked macOS frameworks
      *

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,7 +5,10 @@
 namespace SPC\builder\unix;
 
 use SPC\builder\BuilderBase;
+use SPC\builder\freebsd\library\BSDLibraryBase;
+use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\builder\linux\LinuxBuilder;
+use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -90,6 +93,35 @@ public function makeAutoconfFlags(int $flag = AUTOCONF_ALL): string
         return $extra;
     }
 
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    public function makeAutoconfArgs(string $name, array $libSpecs): string
+    {
+        $ret = '';
+        foreach ($libSpecs as $libName => $arr) {
+            $lib = $this->getLib($libName);
+            if ($lib === null && str_starts_with($libName, 'lib')) {
+                $lib = $this->getLib(substr($libName, 3));
+            }
+
+            $arr = $arr ?? [];
+
+            $disableArgs = $arr[0] ?? null;
+            $prefix = $arr[1] ?? null;
+            if ($lib instanceof LinuxLibraryBase || $lib instanceof MacOSLibraryBase || $lib instanceof BSDLibraryBase) {
+                logger()->info("{$name} \033[32;1mwith\033[0;1m {$libName} support");
+                $ret .= "--with-{$libName}=yes " . $lib->makeAutoconfEnv($prefix) . ' ';
+            } else {
+                logger()->info("{$name} \033[31;1mwithout\033[0;1m {$libName} support");
+                $ret .= ($disableArgs ?? "--with-{$libName}=no") . ' ';
+            }
+        }
+        return rtrim($ret);
+    }
+
     public function proveLibs(array $sorted_libraries): void
     {
         // search all supported libs

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

@@ -49,5 +49,10 @@ protected function build(): void
             ->execWithEnv("make -j{$this->builder->concurrency}")
             ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libngtcp2.pc', 'libngtcp2_crypto_ossl.pc']);
+
+        // on macOS, the static library may contain other static libraries?
+        // ld: archive member 'libssl.a' not a mach-o file in libngtcp2_crypto_ossl.a
+        shell()->cd(BUILD_LIB_PATH)
+            ->exec("ar -t libngtcp2_crypto_ossl.a | grep '\\.a$' | xargs -n1 ar d libngtcp2_crypto_ossl.a");
     }
 }