From 40d602c82ee673a59bed8d1c31cf98264b070ac4 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Thu, 19 Jun 2025 12:08:53 +0700 Subject: [PATCH] xcaddy fails with this, because the module still calls itself dunglas/frankenphp --- config/env.ini | 2 +- src/SPC/builder/unix/UnixBuilderBase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/env.ini b/config/env.ini index aa85751b..d80bc3e7 100644 --- a/config/env.ini +++ b/config/env.ini @@ -43,7 +43,7 @@ SPC_SKIP_PHP_VERSION_CHECK="no" ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed") SPC_SKIP_DOCTOR_CHECK_ITEMS="" ; extra modules that xcaddy will include in the FrankenPHP build -SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/php/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli" +SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli" ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them ; only useful for builds targeting not pure-static linking diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index e76dfa86..27800cd8 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -318,7 +318,7 @@ abstract class UnixBuilderBase extends BuilderBase $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES'); // make it possible to build from a different frankenphp directory! if (!str_contains($xcaddyModules, '--with github.com/php/frankenphp')) { - $xcaddyModules = '--with github.com/php/frankenphp ' . $xcaddyModules; + $xcaddyModules = '--with github.com/dunglas/frankenphp ' . $xcaddyModules; } if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) { logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');