Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1468bb9
Add commit tests
crazywhalecc Jun 13, 2025
45ec0ce
Add checkout
crazywhalecc Jun 13, 2025
3a0d21e
Support multi-line
crazywhalecc Jun 13, 2025
fe455bf
Fix shared-extensions as optional
crazywhalecc Jun 13, 2025
6253b7a
Next pr, I won't run
crazywhalecc Jun 13, 2025
e5cd3ad
Next pr, I won't run
crazywhalecc Jun 13, 2025
0e88cdb
Add shared extension parser
crazywhalecc Jun 14, 2025
3a64fee
Change test strategy for commit tests
crazywhalecc Jun 18, 2025
68548cf
Wrap it to test test test
crazywhalecc Jun 18, 2025
2bfc8e9
Test test
crazywhalecc Jun 18, 2025
cb0a90d
Add source hash comparator & refactor download lock
crazywhalecc Jun 14, 2025
57b2278
Define env in phpunit.xml
crazywhalecc Jun 16, 2025
5cb107b
Test test
crazywhalecc Jun 18, 2025
7057a13
Trigger extension test
crazywhalecc Jun 18, 2025
7178308
Use new trigger test message
crazywhalecc Jun 18, 2025
c1870af
add frankenphp sapi
henderkes Jun 18, 2025
f64eb0d
build for bsd and macos too
henderkes Jun 18, 2025
c1e6832
cs fix
henderkes Jun 18, 2025
92338d4
don't bake the rpath in, otherwise we might run into issues when load…
henderkes Jun 18, 2025
c46f851
watcher...
henderkes Jun 18, 2025
abf3bfb
suggest watcher
henderkes Jun 18, 2025
dca43d6
nicer escaping
henderkes Jun 18, 2025
d635b10
specify system gcc to build xcaddy in spc-gnu-docker
henderkes Jun 18, 2025
d094824
--with github.com/dunglas/caddy-cbrotli requires brotli
henderkes Jun 18, 2025
e71f762
support building static frankenphp
henderkes Jun 18, 2025
f37c863
only needed on linux
henderkes Jun 18, 2025
d58534b
add support for frankenphp directory from file system, instead of pul…
henderkes Jun 18, 2025
82ee6f0
allow specifying if we want to build embed shared or static
henderkes Jun 18, 2025
a1e76d9
remove watcher suggestion
henderkes Jun 18, 2025
8c6a708
ah, the infamous arm64 bug with -fpic vs -fPIC
henderkes Jun 18, 2025
04cefda
Merge pull request #774 from crazywhalecc/fix/arm64-musl
henderkes Jun 18, 2025
b4168d0
Add test extensions as trigger
crazywhalecc Jun 18, 2025
f7a3f80
Add test extensions as trigger
crazywhalecc Jun 18, 2025
24e19de
Merge pull request #768 from crazywhalecc/ci/commit-tests
crazywhalecc Jun 18, 2025
f10ba86
add extension test for frankenphp
henderkes Jun 18, 2025
65b828c
embed version information
henderkes Jun 18, 2025
eee2ff6
don't embed minor version when loading libphp.so
henderkes Jun 18, 2025
ae56931
Remove go download from doctor
crazywhalecc Jun 18, 2025
8e2dffc
Add frankenphp sapi embed build at build command, not constant
crazywhalecc Jun 18, 2025
f709f3b
Add custom package downloader and extractor
crazywhalecc Jun 18, 2025
92284e9
Refactor go and frankenphp downloads and builds
crazywhalecc Jun 18, 2025
d6858e1
phpstan fix
crazywhalecc Jun 18, 2025
74b1dda
Fix test-extensions.php
crazywhalecc Jun 18, 2025
4ecaffd
Fix test-extensions.php
crazywhalecc Jun 18, 2025
becee5b
Use version instead of -v
crazywhalecc Jun 18, 2025
a76f49f
Remove libxml2 requirement for linux
crazywhalecc Jun 18, 2025
1a164fa
Merge pull request #775 from crazywhalecc/sapi/frankenphp-prerequisites
henderkes Jun 19, 2025
15979d4
fix double path
henderkes Jun 19, 2025
cb010d8
there's no documented functionality to download without building - xc…
henderkes Jun 19, 2025
b42409e
LD_LIBRARY_PATH for frankenphp sanity check
henderkes Jun 19, 2025
7dc3b7c
Merge remote-tracking branch 'origin/main' into sapi/frankenphp
crazywhalecc Jun 19, 2025
804468f
refactor common exec code out
henderkes Jun 19, 2025
16fccf8
Merge remote-tracking branch 'origin/sapi/frankenphp' into sapi/frank…
henderkes Jun 19, 2025
6e70f16
Merge remote-tracking branch 'origin/docs' into sapi/frankenphp
henderkes Jun 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
LD_LIBRARY_PATH for frankenphp sanity check
  • Loading branch information
henderkes committed Jun 19, 2025
commit b42409efd183f68141865589479e00ae85e9674b
5 changes: 3 additions & 2 deletions src/SPC/builder/unix/UnixBuilderBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@ protected function sanityCheck(int $build_target): void
if (!file_exists($frankenphp)) {
throw new RuntimeException('FrankenPHP binary not found: ' . $frankenphp);
}
[$ret, $output] = shell()->execWithResult("{$frankenphp} version");
[$ret, $output] = shell()
->setEnv(['LD_LIBRARY_PATH' => BUILD_LIB_PATH])
->execWithResult("{$frankenphp} version");
if ($ret !== 0 || !str_contains(implode('', $output), 'FrankenPHP')) {
throw new RuntimeException('FrankenPHP failed sanity check: ret[' . $ret . ']. out[' . implode('', $output) . ']');
}
Expand Down Expand Up @@ -308,7 +310,6 @@ protected function buildFrankenphp(): void
$arch = arch2gnu(php_uname('m'));

// define executables for go and xcaddy
$go_exec = PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}/bin/go";
$xcaddy_exec = PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}/bin/xcaddy";

$nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
Expand Down