diff --git a/src/SPC/builder/extension/redis.php b/src/SPC/builder/extension/redis.php index 952b004e6..4dd59565b 100644 --- a/src/SPC/builder/extension/redis.php +++ b/src/SPC/builder/extension/redis.php @@ -16,9 +16,11 @@ public function getUnixConfigureArg(bool $shared = false): string if ($this->isBuildStatic()) { $arg .= $this->builder->getExt('session')?->isBuildStatic() ? ' --enable-redis-session' : ' --disable-redis-session'; $arg .= $this->builder->getExt('igbinary')?->isBuildStatic() ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary'; + $arg .= $this->builder->getExt('msgpack')?->isBuildStatic() ? ' --enable-redis-msgpack' : ' --disable-redis-msgpack'; } else { $arg .= $this->builder->getExt('session') ? ' --enable-redis-session' : ' --disable-redis-session'; $arg .= $this->builder->getExt('igbinary') ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary'; + $arg .= $this->builder->getExt('msgpack') ? ' --enable-redis-msgpack' : ' --disable-redis-msgpack'; } if ($this->builder->getLib('zstd')) { $arg .= ' --enable-redis-zstd --with-libzstd="' . BUILD_ROOT_PATH . '"'; diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php index 17c5c500f..86d197c81 100644 --- a/src/SPC/util/SPCConfigUtil.php +++ b/src/SPC/util/SPCConfigUtil.php @@ -80,9 +80,7 @@ public function config(array $extensions = [], array $libraries = [], bool $incl } if ($this->builder->hasCpp()) { $libcpp = SPCTarget::getTargetOS() === 'Darwin' ? '-lc++' : '-lstdc++'; - if (!str_contains($libs, $libcpp)) { - $libs .= " {$libcpp}"; - } + $libs = str_replace($libcpp, '', $libs) . " {$libcpp}"; } if ($this->libs_only_deps) {