Merge remote-tracking branch 'origin/main' into fix/icurel

config/lib.json

@@ -635,9 +635,6 @@
         ],
         "lib-depends": [
             "openssl"
-        ],
-        "lib-suggests": [
-            "ngtcp2"
         ]
     },
     "ngtcp2": {
@@ -655,6 +652,10 @@
         ],
         "lib-depends": [
             "openssl"
+        ],
+        "lib-suggests": [
+            "nghttp3",
+            "brotli"
         ]
     },
     "onig": {

src/SPC/builder/linux/LinuxBuilder.php

@@ -81,7 +81,7 @@ class LinuxBuilder extends UnixBuilderBase
         foreach ($libSpecs as $libName => $arr) {
             $lib = $this->getLib($libName);
             if ($lib === null && str_starts_with($libName, 'lib')) {
-                $lib = $this->getExt(substr($libName, 3));
+                $lib = $this->getLib(substr($libName, 3));
             }
 
             $arr = $arr ?? [];

src/SPC/builder/linux/library/openssl.php

@@ -96,4 +96,13 @@ class openssl extends LinuxLibraryBase
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
     }
+
+    public function getStaticLibFiles(string $style = 'autoconf', bool $recursive = true): string
+    {
+        $libFiles = parent::getStaticLibFiles($style, $recursive);
+        if (!str_contains('-ldl -lpthread', $libFiles)) {
+            $libFiles .= ' -ldl -lpthread';
+        }
+        return $libFiles;
+    }
 }

src/SPC/builder/macos/MacOSBuilder.php

@@ -56,7 +56,7 @@ class MacOSBuilder extends UnixBuilderBase
         foreach ($lib_specs as $libName => $arr) {
             $lib = $this->getLib($libName);
             if ($lib === null && str_starts_with($libName, 'lib')) {
-                $lib = $this->getExt(substr($libName, 3));
+                $lib = $this->getLib(substr($libName, 3));
             }
 
             $arr = $arr ?? [];

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

@@ -31,6 +31,12 @@ trait nghttp2
             'jemalloc' => null,
             'systemd' => null,
         ]);
+        if ($brotli = $this->builder->getLib('brotli')) {
+            /* @phpstan-ignore-next-line */
+            $args .= ' --with-libbrotlidec=yes LIBBROTLIDEC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIDEC_LIBS="' . $brotli->getStaticLibFiles() . '"';
+            /* @phpstan-ignore-next-line */
+            $args .= ' --with-libbrotlienc=yes LIBBROTLIENC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIENC_LIBS="' . $brotli->getStaticLibFiles() . '"';
+        }
 
         [,,$destdir] = SEPARATED_PATH;
 

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

@@ -6,22 +6,15 @@ namespace SPC\builder\unix\library;
 
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 
 trait nghttp3
 {
     /**
      * @throws FileSystemException
      * @throws RuntimeException
-     * @throws WrongUsageException
      */
     protected function build(): void
     {
-        $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
-            'openssl' => null,
-        ]);
-
         shell()->cd($this->source_dir)
             ->setEnv([
                 'CFLAGS' => $this->getLibExtraCFlags(),
@@ -34,7 +27,6 @@ trait nghttp3
                 '--disable-shared ' .
                 '--with-pic ' .
                 '--enable-lib-only ' .
-                $args . ' ' .
                 '--prefix='
             )
             ->execWithEnv('make clean')

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

@@ -18,12 +18,17 @@ trait ngtcp2
     protected function build(): void
     {
         $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
             'openssl' => null,
-            'libxml2' => null,
             'libev' => null,
             'jemalloc' => null,
+            'libnghttp3' => null,
         ]);
+        if ($brotli = $this->builder->getLib('brotli')) {
+            /* @phpstan-ignore-next-line */
+            $args .= ' --with-libbrotlidec=yes LIBBROTLIDEC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIDEC_LIBS="' . $brotli->getStaticLibFiles() . '"';
+            /* @phpstan-ignore-next-line */
+            $args .= ' --with-libbrotlienc=yes LIBBROTLIENC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIENC_LIBS="' . $brotli->getStaticLibFiles() . '"';
+        }
 
         shell()->cd($this->source_dir)
             ->setEnv([
@@ -43,8 +48,6 @@ trait ngtcp2
             ->execWithEnv('make clean')
             ->execWithEnv("make -j{$this->builder->concurrency}")
             ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH);
-        $this->patchPkgconfPrefix(['libngtcp2.pc']);
+        $this->patchPkgconfPrefix(['libngtcp2.pc', 'libngtcp2_crypto_ossl.pc']);
-        $this->patchPkgconfPrefix(['libngtcp2_crypto_ossl.pc']);
-        $this->patchLaDependencyPrefix(['libngtcp2.la', 'libngtcp2_crypto_ossl.la']);
     }
 }