diff --git a/config/ext.json b/config/ext.json index d48646ae..bd98ac43 100644 --- a/config/ext.json +++ b/config/ext.json @@ -430,8 +430,8 @@ "ext-depends": [ "mysqlnd" ], - "target": [ - "static" + "shared-ext-depends": [ + "mysqlnd" ] }, "mysqlnd": { @@ -439,9 +439,6 @@ "arg-type-windows": "with", "lib-depends": [ "zlib" - ], - "target": [ - "static" ] }, "oci8": { @@ -682,7 +679,8 @@ "build-with-php": true }, "shmop": { - "type": "builtin" + "type": "builtin", + "build-with-php": true }, "simdjson": { "type": "external", @@ -792,6 +790,7 @@ "arg-type": "with-prefix", "arg-type-windows": "with", "lib-depends": [ + "openssl", "libssh2" ], "ext-depends-windows": [ diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index b8dc8c4c..f25b82a7 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -230,9 +230,9 @@ class Extension foreach ($order as $ext) { if ($ext instanceof Extension && $ext->isBuildShared()) { if ($ext->isZendExtension()) { - $ret .= ' -d "zend_extension=' . BUILD_MODULES_PATH . '/' . $ext->getName() . '.so"'; + $ret .= " -d \"zend_extension={$ext->getName()}\""; } else { - $ret .= ' -d "extension=' . BUILD_MODULES_PATH . '/' . $ext->getName() . '.so"'; + $ret .= " -d \"extension={$ext->getName()}\""; } } } @@ -249,7 +249,8 @@ class Extension // If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php // If check failed, throw RuntimeException $sharedExtensions = $this->getRequiredSharedExtensions(); - [$ret] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"', false); + putenv('EXTENSION_DIR=' . BUILD_MODULES_PATH); + [$ret] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"'); if ($ret !== 0) { throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret); } diff --git a/src/SPC/builder/extension/mbregex.php b/src/SPC/builder/extension/mbregex.php index a26e7024..5990b3a6 100644 --- a/src/SPC/builder/extension/mbregex.php +++ b/src/SPC/builder/extension/mbregex.php @@ -26,7 +26,7 @@ class mbregex extends Extension */ public function runCliCheckUnix(): void { - $sharedext = $this->builder->getExt('mbstring')->isBuildShared() ? ' -d "extension=' . BUILD_MODULES_PATH . '/mbstring.so"' : ''; + $sharedext = $this->builder->getExt('mbstring')->isBuildShared() ? ' -d "extension=mbstring.so"' : ''; [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n' . $sharedext . ' --ri "mbstring" | grep regex', false); if ($ret !== 0) { throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: compiled php-cli mbstring extension does not contain regex !');