crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 12:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix remaining errors

Browse Source
This commit is contained in:
DubbleClick 2025-07-22 11:23:42 +07:00
parent 0bdafed92f
commit 6594f6b653
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/lib.json
View File

@ -424,7 +424,7 @@
"source": "libjxl", "source": "libjxl",
"static-libs-unix": [ "static-libs-unix": [
"libjxl.a", "libjxl.a",
"libjxl_dec.a", "libjxl_cms.a",
"libjxl_threads.a", "libjxl_threads.a",
"libhwy.a" "libhwy.a"
], ],

1
config/source.json
View File

@ -563,6 +563,7 @@
"rev": "main", "rev": "main",
"submodules": [ "submodules": [
"third_party/highway", "third_party/highway",
"third_party/libjpeg-turbo",
"third_party/sjpeg", "third_party/sjpeg",
"third_party/skcms" "third_party/skcms"
], ],

5
src/SPC/builder/Extension.php
View File

@ -516,8 +516,7 @@ class Extension
$sharedLibString = ''; $sharedLibString = '';
$staticLibString = ''; $staticLibString = '';
$staticLibs = $this->getLibFilesString(); $staticLibs = $this->getLibFilesString();
$staticLibs = str_replace(BUILD_LIB_PATH . '/lib', '-l', $staticLibs); $staticLibs = str_replace([BUILD_LIB_PATH . '/lib', '.a'], ['-l', ''], $staticLibs);
$staticLibs = str_replace('.a', '', $staticLibs);
$staticLibs = explode('-l', $staticLibs . ' ' . $config['libs']); $staticLibs = explode('-l', $staticLibs . ' ' . $config['libs']);
foreach ($staticLibs as $lib) { foreach ($staticLibs as $lib) {
$lib = trim($lib); $lib = trim($lib);
@ -534,7 +533,7 @@ class Extension
} }
} }
// move static libstdc++ to shared if we are on non-full-static build target // move static libstdc++ to shared if we are on non-full-static build target
if (!SPCTarget::isStatic() && in_array(SPCTarget::getLibc(), SPCTarget::LIBC_LIST)) { if (SPCTarget::isStatic()) {
$staticLibString .= ' -lstdc++'; $staticLibString .= ' -lstdc++';
$sharedLibString = str_replace('-lstdc++', '', $sharedLibString); $sharedLibString = str_replace('-lstdc++', '', $sharedLibString);
} }

2
src/SPC/builder/unix/library/libjxl.php
View File

@ -17,7 +17,9 @@ trait libjxl
->addConfigureArgs('-DJPEGXL_ENABLE_MANPAGES=OFF') ->addConfigureArgs('-DJPEGXL_ENABLE_MANPAGES=OFF')
->addConfigureArgs('-DJPEGXL_ENABLE_BENCHMARK=OFF') ->addConfigureArgs('-DJPEGXL_ENABLE_BENCHMARK=OFF')
->addConfigureArgs('-DJPEGXL_ENABLE_PLUGINS=OFF') ->addConfigureArgs('-DJPEGXL_ENABLE_PLUGINS=OFF')
->addConfigureArgs('-DJPEGXL_ENABLE_SJPOEG=ON')
->addConfigureArgs('-DJPEGXL_ENABLE_JNI=OFF') ->addConfigureArgs('-DJPEGXL_ENABLE_JNI=OFF')
->addConfigureArgs('-DJPEGXL_ENABLE_TRANSCODE_JPEG=ON')
->addConfigureArgs('-DJPEGXL_STATIC=' . (SPCTarget::isStatic() ? 'ON' : 'OFF')) ->addConfigureArgs('-DJPEGXL_STATIC=' . (SPCTarget::isStatic() ? 'ON' : 'OFF'))
->addConfigureArgs('-DJPEGXL_FORCE_SYSTEM_BROTLI=ON') ->addConfigureArgs('-DJPEGXL_FORCE_SYSTEM_BROTLI=ON')
->addConfigureArgs('-DBUILD_TESTING=OFF') ->addConfigureArgs('-DBUILD_TESTING=OFF')