diff --git a/config/ext.json b/config/ext.json index b9fc28a5..0dca824b 100644 --- a/config/ext.json +++ b/config/ext.json @@ -455,7 +455,8 @@ }, "opcache": { "type": "builtin", - "arg-type-unix": "custom" + "arg-type-unix": "custom", + "zend-extension": true }, "openssl": { "notes": true, @@ -952,7 +953,8 @@ "Darwin": "partial", "Linux": "partial" }, - "notes": true + "notes": true, + "zend-extension": true }, "xhprof": { "support": { diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index 6fd8b52f..22c35d33 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -226,7 +226,7 @@ class Extension $ret = ''; foreach ($order as $ext) { if ($ext instanceof Extension && $ext->isBuildShared()) { - if ($ext->isZendExtension()) { + if (Config::getExt($ext->getName(), 'zend_extension', false) === true) { $ret .= " -d \"zend_extension={$ext->getName()}\""; } else { $ret .= " -d \"extension={$ext->getName()}\""; @@ -448,11 +448,6 @@ class Extension } } - protected function isZendExtension(): bool - { - return false; - } - private function getLibraryDependencies(bool $recursive = false): array { $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase); diff --git a/src/SPC/builder/extension/opcache.php b/src/SPC/builder/extension/opcache.php index 865bf487..5d9dda0a 100644 --- a/src/SPC/builder/extension/opcache.php +++ b/src/SPC/builder/extension/opcache.php @@ -51,9 +51,4 @@ class opcache extends Extension { return 'Zend Opcache'; } - - protected function isZendExtension(): bool - { - return true; - } } diff --git a/src/SPC/builder/extension/xdebug.php b/src/SPC/builder/extension/xdebug.php deleted file mode 100644 index cdfeea8c..00000000 --- a/src/SPC/builder/extension/xdebug.php +++ /dev/null @@ -1,17 +0,0 @@ -