mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-05 15:55:39 +08:00
Merge branch 'feat/frankenphp-pgo' into feat/pgo
This commit is contained in:
@@ -464,9 +464,10 @@ abstract class UnixBuilderBase extends BuilderBase
|
||||
"-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
|
||||
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
|
||||
], ...GoXcaddy::getEnvironment()];
|
||||
$pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
|
||||
shell()->cd(BUILD_BIN_PATH)
|
||||
->setEnv($env)
|
||||
->exec("xcaddy build --output frankenphp {$xcaddyModules}");
|
||||
->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
|
||||
|
||||
$this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace SPC\builder\unix\library;
|
||||
|
||||
use SPC\store\FileSystem;
|
||||
use SPC\util\executor\UnixCMakeExecutor;
|
||||
|
||||
trait curl
|
||||
@@ -33,8 +34,16 @@ trait curl
|
||||
)
|
||||
->build();
|
||||
|
||||
// patch pkgconf
|
||||
$this->patchPkgconfPrefix(['libcurl.pc']);
|
||||
// On glibc <2.28 without built-in pthreads, FindThreads sets
|
||||
// INTERFACE_LINK_LIBRARIES to '-lpthread'
|
||||
// curls .pc generator walks and prepends '-l' to each
|
||||
// entry, resulting in -l-lpthread
|
||||
FileSystem::replaceFileRegex(
|
||||
BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
|
||||
'/-l(-l\S+)/',
|
||||
'$1'
|
||||
);
|
||||
shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
|
||||
->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
|
||||
'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
|
||||
'GOPATH' => "{$pkgroot}/go",
|
||||
])
|
||||
->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
|
||||
->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
|
||||
}
|
||||
|
||||
public static function getEnvironment(): array
|
||||
|
||||
Reference in New Issue
Block a user