From ba1bde0b013c7bfed862b76299ccd40b2d0cd674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 20 Apr 2024 12:13:55 +0200 Subject: [PATCH] patch --- src/SPC/builder/linux/LinuxBuilder.php | 5 +++-- src/SPC/builder/macos/MacOSBuilder.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 8ca0bb39..12393627 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -142,8 +142,6 @@ class LinuxBuilder extends UnixBuilderBase 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), '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 @@ -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') ->exec( getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' . diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php index 0b11830e..6c601816 100644 --- a/src/SPC/builder/macos/MacOSBuilder.php +++ b/src/SPC/builder/macos/MacOSBuilder.php @@ -147,8 +147,6 @@ class MacOSBuilder extends UnixBuilderBase 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), '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')) { @@ -175,6 +173,9 @@ class MacOSBuilder extends UnixBuilderBase $this->emitPatchPoint('before-php-make'); 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(); if ($enableCli) {