Fix all extension builds

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,9 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\unix;
 
 use SPC\builder\BuilderBase;
-use SPC\builder\freebsd\library\BSDLibraryBase;
-use SPC\builder\linux\library\LinuxLibraryBase;
-use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -27,85 +24,6 @@ abstract class UnixBuilderBase extends BuilderBase
     /** @var string C++ flags */
     public string $arch_cxx_flags;
 
-    /**
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
-    public function getAllStaticLibFiles(): array
-    {
-        $libs = [];
-
-        // reorder libs
-        foreach ($this->libs as $lib) {
-            foreach ($lib->getDependencies() as $dep) {
-                $libs[] = $dep;
-            }
-            $libs[] = $lib;
-        }
-
-        $libFiles = [];
-        $libNames = [];
-        // merge libs
-        foreach ($libs as $lib) {
-            if (!in_array($lib::NAME, $libNames, true)) {
-                $libNames[] = $lib::NAME;
-                array_unshift($libFiles, ...$lib->getStaticLibs());
-            }
-        }
-        return array_map(fn ($x) => realpath(BUILD_LIB_PATH . "/{$x}"), $libFiles);
-    }
-
-    /**
-     * Generate configure flags
-     */
-    public function makeAutoconfFlags(int $flag = AUTOCONF_ALL): string
-    {
-        $extra = '';
-        // TODO: add auto pkg-config support
-        if (($flag & AUTOCONF_LIBS) === AUTOCONF_LIBS) {
-            $extra .= 'LIBS="' . BUILD_LIB_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_CFLAGS) === AUTOCONF_CFLAGS) {
-            $extra .= 'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_CPPFLAGS) === AUTOCONF_CPPFLAGS) {
-            $extra .= 'CPPFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_LDFLAGS) === AUTOCONF_LDFLAGS) {
-            $extra .= 'LDFLAGS="-L' . BUILD_LIB_PATH . '" ';
-        }
-        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/libxslt.php

@@ -24,7 +24,7 @@ trait libxslt
             ->appendEnv([
                 'CFLAGS' => "-I{$this->getIncludeDir()}",
                 'LDFLAGS' => "-L{$this->getLibDir()}",
-                'LIBS' => "{$static_libs} -lstdc++",
+                'LIBS' => "{$static_libs}",
             ])
             ->addConfigureArgs(
                 '--without-python',
@@ -41,7 +41,7 @@ trait libxslt
         }
         $ac->configure()->make();
 
-        $this->patchPkgconfPrefix(['libexslt.pc']);
+        $this->patchPkgconfPrefix(['libxslt.pc']);
         $this->patchLaDependencyPrefix();
         shell()->cd(BUILD_LIB_PATH)
             ->exec("ar -t libxslt.a | grep '\\.a$' | xargs -n1 ar d libxslt.a")

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

@@ -21,8 +21,6 @@ trait ngtcp2
         UnixAutoconfExecutor::create($this)
             ->optionalLib('openssl', fn ($lib) => implode(' ', [
                 '--with-openssl=yes',
-                "OPENSSL_LIBS=\"{$lib->getStaticLibFiles()}\"",
-                "OPENSSL_CFLAGS=\"-I{$lib->getIncludeDir()}\"",
             ]), '--with-openssl=no')
             ->optionalLib('libev', ...ac_with_args('libev', true))
             ->optionalLib('nghttp3', ...ac_with_args('libnghttp3', true))
@@ -30,12 +28,8 @@ trait ngtcp2
             ->optionalLib(
                 'brotli',
                 fn ($lib) => implode(' ', [
-                    '--with-brotlidec=yes',
-                    "LIBBROTLIDEC_CFLAGS=\"-I{$lib->getIncludeDir()}\"",
-                    "LIBBROTLIDEC_LIBS=\"{$lib->getStaticLibFiles()}\"",
+                    '--with-libbrotlidec=yes',
                     '--with-libbrotlienc=yes',
-                    "LIBBROTLIENC_CFLAGS=\"-I{$lib->getIncludeDir()}\"",
-                    "LIBBROTLIENC_LIBS=\"{$lib->getStaticLibFiles()}\"",
                 ])
             )
             ->appendEnv(['PKG_CONFIG' => '$PKG_CONFIG --static'])

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

@@ -21,6 +21,7 @@ trait xz
                 '--disable-scripts',
                 '--disable-doc',
                 '--with-libiconv',
+                '--bindir=/tmp/xz', // xz binary will corrupt `tar` command, that's really strange.
             )
             ->make();
         $this->patchPkgconfPrefix(['liblzma.pc']);