mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-06 16:25:39 +08:00
Merge branch 'main' into fix/lide265
This commit is contained in:
@@ -162,7 +162,7 @@ class LinuxBuilder extends UnixBuilderBase
|
||||
throw new WrongUsageException(
|
||||
"You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
|
||||
'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
|
||||
'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
|
||||
'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc` or use SPC_MUSL_DYNAMIC=true on alpine.'
|
||||
);
|
||||
}
|
||||
logger()->info('Building shared extensions...');
|
||||
|
||||
@@ -31,8 +31,23 @@ class zlib extends WindowsLibraryBase
|
||||
$this->builder->makeSimpleWrapper('cmake'),
|
||||
"--build build --config Release --target install -j{$this->builder->concurrency}"
|
||||
);
|
||||
copy(BUILD_LIB_PATH . '\zlibstatic.lib', BUILD_LIB_PATH . '\zlib_a.lib');
|
||||
unlink(BUILD_ROOT_PATH . '\bin\zlib.dll');
|
||||
unlink(BUILD_LIB_PATH . '\zlib.lib');
|
||||
$detect_list = [
|
||||
'zlibstatic.lib',
|
||||
'zs.lib',
|
||||
'libzs.lib',
|
||||
];
|
||||
foreach ($detect_list as $item) {
|
||||
if (file_exists(BUILD_LIB_PATH . '\\' . $item)) {
|
||||
FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlib_a.lib');
|
||||
FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlibstatic.lib');
|
||||
break;
|
||||
}
|
||||
}
|
||||
FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '\bin\zlib.dll');
|
||||
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\zlib.lib');
|
||||
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.dll');
|
||||
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.lib');
|
||||
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.lib');
|
||||
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.dll');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -634,7 +634,13 @@ class SourcePatcher
|
||||
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
|
||||
}
|
||||
// custom config.w32, because official config.w32 is hard-coded many things
|
||||
$origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
|
||||
if ($ver_id >= 80500) {
|
||||
$origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
|
||||
} elseif ($ver_id >= 80100) {
|
||||
$origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
|
||||
} else {
|
||||
$origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
|
||||
}
|
||||
file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
|
||||
return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user