Skip to content

Commit 40d602c

Browse files
committed
xcaddy fails with this, because the module still calls itself dunglas/frankenphp
1 parent fbd6360 commit 40d602c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

config/env.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ SPC_SKIP_PHP_VERSION_CHECK="no"
4343
; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
4444
SPC_SKIP_DOCTOR_CHECK_ITEMS=""
4545
; extra modules that xcaddy will include in the FrankenPHP build
46-
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"
46+
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"
4747

4848
; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
4949
; only useful for builds targeting not pure-static linking

src/SPC/builder/unix/UnixBuilderBase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ protected function buildFrankenphp(): void
318318
$xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
319319
// make it possible to build from a different frankenphp directory!
320320
if (!str_contains($xcaddyModules, '--with github.com/php/frankenphp')) {
321-
$xcaddyModules = '--with github.com/php/frankenphp ' . $xcaddyModules;
321+
$xcaddyModules = '--with github.com/dunglas/frankenphp ' . $xcaddyModules;
322322
}
323323
if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) {
324324
logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');

0 commit comments

Comments
 (0)