diff --git a/config/lib.json b/config/lib.json index da330f9b..a56d8772 100644 --- a/config/lib.json +++ b/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" diff --git a/src/SPC/builder/unix/library/brotli.php b/src/SPC/builder/unix/library/brotli.php index 15568ef3..08eae3a1 100644 --- a/src/SPC/builder/unix/library/brotli.php +++ b/src/SPC/builder/unix/library/brotli.php @@ -27,11 +27,7 @@ trait brotli ->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);