last problems (?)

This commit is contained in:
DubbleClick 2025-05-22 15:46:42 +07:00
parent 396d4b341f
commit 0afe0e5f46
6 changed files with 9 additions and 29 deletions

View File

@ -373,7 +373,8 @@
],
"shared-ext-depends": [
"session"
]
],
"build-with-php": true
},
"memcached": {
"support": {
@ -677,7 +678,8 @@
]
},
"session": {
"type": "builtin"
"type": "builtin",
"build-with-php": true
},
"shmop": {
"type": "builtin"
@ -973,7 +975,8 @@
"source": "xhprof",
"ext-depends": [
"ctype"
]
],
"build-with-php": true
},
"xlswriter": {
"support": {

View File

@ -362,7 +362,7 @@ class Extension
}
$env = [
'CFLAGS' => $config['cflags'],
'LDFLAGS' => $config['ldflags'] . ' -Wl,--allow-multiple-definition',
'LDFLAGS' => $config['ldflags'],
'LIBS' => '-Wl,-Bstatic ' . $staticLibs . ' -Wl,-Bdynamic ' . $sharedLibs,
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
];

View File

@ -18,8 +18,6 @@ class intl extends Extension
// Also need to use clang++ -std=c++17 to force override the default C++ standard
if (is_string($env = getenv('CXX')) && !str_contains($env, 'std=c++17')) {
f_putenv('CXX=' . $env . ' -std=c++17');
} else {
f_putenv('CXX=clang++ -std=c++17');
}
return true;
}

View File

@ -14,7 +14,7 @@ class memcache extends Extension
{
public function getUnixConfigureArg(bool $shared = false): string
{
return '--enable-memcache --with-zlib-dir=' . BUILD_ROOT_PATH;
return '--enable-memcache' . ($shared ? '=shared' : '') . ' --with-zlib-dir=' . BUILD_ROOT_PATH;
}
/**

View File

@ -14,6 +14,6 @@ class memcached extends Extension
{
$rootdir = BUILD_ROOT_PATH;
$zlib_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : "--with-zlib-dir={$rootdir}";
return "--enable-memcached {$zlib_dir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json";
return "--enable-memcached" . ($shared ? '=shared' : '') . " {$zlib_dir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json";
}
}

View File

@ -1,21 +0,0 @@
<?php
declare(strict_types=1);
namespace SPC\builder\extension;
use SPC\builder\Extension;
use SPC\util\CustomExt;
#[CustomExt('sockets')]
class sockets extends Extension
{
public function patchBeforeConfigure(): bool
{
if (file_exists(BUILD_INCLUDE_PATH . 'php/ext/sockets/php_sockets.h')) {
return false;
}
copy(SOURCE_PATH . '/php-src/ext/sockets/php_sockets.h', BUILD_INCLUDE_PATH . 'php/ext/sockets/php_sockets.h');
return true;
}
}