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

patch

Browse Source
This commit is contained in:
Kévin Dunglas
2024-04-20 12:13:55 +02:00
parent 57b3db4814
commit ba1bde0b01
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,6 @@ class LinuxBuilder extends UnixBuilderBase
'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'), 'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'),
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
'CXX' => 'g++ -std=c++17',
]); ]);
// upx pack and strip for micro // upx pack and strip for micro
@@ -170,6 +168,9 @@ class LinuxBuilder extends UnixBuilderBase
); );
} }
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
shell()->cd(SOURCE_PATH . '/php-src') shell()->cd(SOURCE_PATH . '/php-src')
->exec( ->exec(
getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' . getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .

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

@@ -147,8 +147,6 @@ class MacOSBuilder extends UnixBuilderBase
'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
'CXX' => 'g++ -std=c++17',
]); ]);
if ($this->getLib('postgresql')) { if ($this->getLib('postgresql')) {
@@ -175,6 +173,9 @@ class MacOSBuilder extends UnixBuilderBase
$this->emitPatchPoint('before-php-make'); $this->emitPatchPoint('before-php-make');
SourcePatcher::patchBeforeMake($this); SourcePatcher::patchBeforeMake($this);
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
$this->cleanMake(); $this->cleanMake();
if ($enableCli) { if ($enableCli) {