From c0483b4b3439c4fe379726107ac7412ee50d08b4 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sun, 20 Jul 2025 02:49:30 +0700 Subject: [PATCH] don't download libpng, zlib, brotli, as we already build them --- src/SPC/builder/unix/library/libjxl.php | 4 ++-- src/SPC/builder/unix/library/libtiff.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SPC/builder/unix/library/libjxl.php b/src/SPC/builder/unix/library/libjxl.php index 7917280a..71848001 100644 --- a/src/SPC/builder/unix/library/libjxl.php +++ b/src/SPC/builder/unix/library/libjxl.php @@ -18,8 +18,8 @@ trait libjxl } FileSystem::replaceFileStr( $this->source_dir . '/deps.sh', - 'return 0', - '# return 0', + ['return 0', 'download_github third_party/brotli', 'download_github third_party/zlib', 'download_github third_party/libpng'], + ['# return 0', '# download_github third_party/brotli', '# download_github third_party/zlib', '# download_github third_party/libpng'], ); shell()->cd($this->source_dir) ->exec('./deps.sh'); diff --git a/src/SPC/builder/unix/library/libtiff.php b/src/SPC/builder/unix/library/libtiff.php index f46f32fc..b4afdd7f 100644 --- a/src/SPC/builder/unix/library/libtiff.php +++ b/src/SPC/builder/unix/library/libtiff.php @@ -18,7 +18,7 @@ trait libtiff */ protected function build(): void { - $libcpp = SPCTarget::getTargetOS() === 'Darwin' ? '-lc++' : '-lstdc++'; + $libcpp = SPCTarget::getTargetOS() === 'Linux' ? '-lstdc++' : '-lc++'; FileSystem::replaceFileStr($this->source_dir . '/configure', '-lwebp', '-lwebp -lsharpyuv'); FileSystem::replaceFileStr($this->source_dir . '/configure', '-l"$lerc_lib_name"', '-l"$lerc_lib_name" ' . $libcpp); UnixAutoconfExecutor::create($this)