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

fix bugs when building micro and embed at the same time

Browse Source
This commit is contained in:
crazywhalecc
2023-10-01 01:32:43 +08:00
committed by Jerry Ma
parent 8636f2e7c9
commit 92cafb36f6
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
use SPC\exception\FileSystemException; use SPC\exception\FileSystemException;
use SPC\exception\RuntimeException; use SPC\exception\RuntimeException;
use SPC\exception\WrongUsageException; use SPC\exception\WrongUsageException;
use SPC\store\FileSystem;
use SPC\store\SourcePatcher; use SPC\store\SourcePatcher;
class LinuxBuilder extends BuilderBase class LinuxBuilder extends BuilderBase
@@ -223,6 +224,9 @@ class LinuxBuilder extends BuilderBase
} }
if ($enableEmbed) { if ($enableEmbed) {
logger()->info('building embed'); logger()->info('building embed');
if ($enableMicro) {
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
}
$this->buildEmbed($extra_libs, $use_lld); $this->buildEmbed($extra_libs, $use_lld);
} }

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

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
use SPC\exception\FileSystemException; use SPC\exception\FileSystemException;
use SPC\exception\RuntimeException; use SPC\exception\RuntimeException;
use SPC\exception\WrongUsageException; use SPC\exception\WrongUsageException;
use SPC\store\FileSystem;
use SPC\store\SourcePatcher; use SPC\store\SourcePatcher;
class MacOSBuilder extends BuilderBase class MacOSBuilder extends BuilderBase
@@ -195,6 +196,9 @@ class MacOSBuilder extends BuilderBase
} }
if ($enableEmbed) { if ($enableEmbed) {
logger()->info('building embed'); logger()->info('building embed');
if ($enableMicro) {
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
}
$this->buildEmbed(); $this->buildEmbed();
} }

2
src/SPC/store/SourcePatcher.php
View File

@@ -141,6 +141,8 @@ class SourcePatcher
} }
FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/main/php_config.h', '/^#define HAVE_OPENPTY 1$/m', ''); FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/main/php_config.h', '/^#define HAVE_OPENPTY 1$/m', '');
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'install-micro', '');
// call extension patch before make // call extension patch before make
foreach ($builder->getExts() as $ext) { foreach ($builder->getExts() as $ext) {
if ($ext->patchBeforeMake() === true) { if ($ext->patchBeforeMake() === true) {