crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-04 07:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SPC_CMD_VAR_PHP_EMBED_TYPE for embed building in glibc mode

Browse Source
This commit is contained in:
crazywhalecc
2025-03-10 16:15:47 +08:00
parent b6324fd71e
commit 1ce1c326b2
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/SPC/builder/linux/LinuxBuilder.php
View File

@@ -169,12 +169,13 @@ class LinuxBuilder extends UnixBuilderBase
// micro latest needs do strip and upx pack later (strip, upx, cut binary manually supported)
}
$embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
shell()->cd(SOURCE_PATH . '/php-src')
->exec(
getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
($enable_cli ? '--enable-cli ' : '--disable-cli ') .
($enable_fpm ? '--enable-fpm ' : '--disable-fpm ') .
($enable_embed ? '--enable-embed=static ' : '--disable-embed ') .
($enable_embed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
($enable_micro ? '--enable-micro=all-static ' : '--disable-micro ') .
$config_file_path .
$config_file_scan_dir .

3
src/SPC/builder/macos/MacOSBuilder.php
View File

@@ -162,12 +162,13 @@ class MacOSBuilder extends UnixBuilderBase
);
}
$embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
shell()->cd(SOURCE_PATH . '/php-src')
->exec(
getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
($enableCli ? '--enable-cli ' : '--disable-cli ') .
($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') .
($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
($enableMicro ? '--enable-micro ' : '--disable-micro ') .
$config_file_path .
$config_file_scan_dir .

10
src/SPC/builder/unix/UnixBuilderBase.php
View File

@@ -192,7 +192,15 @@ abstract class UnixBuilderBase extends BuilderBase
if ($ret !== 0) {
throw new RuntimeException('embed failed sanity check: build failed. Error message: ' . implode("\n", $out));
}
[$ret, $output] = shell()->cd($sample_file_path)->execWithResult('./embed');
// if someone changed to --enable-embed=shared, we need to add LD_LIBRARY_PATH
if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
$ext_path = 'LD_LIBRARY_PATH=' . BUILD_ROOT_PATH . '/lib:$LD_LIBRARY_PATH ';
FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.a');
} else {
$ext_path = '';
FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.so');
}
[$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
throw new RuntimeException('embed failed sanity check: run failed. Error message: ' . implode("\n", $output));
}

7
src/SPC/store/FileSystem.php
View File

@@ -454,6 +454,13 @@ class FileSystem
unlink($path . '.bak');
}
public static function removeFileIfExists(string $string): void
{
if (file_exists($string)) {
unlink($string);
}
}
/**
* @throws RuntimeException
* @throws FileSystemException