Rename initBuildEnv to initializeEnv

This commit is contained in:
crazywhalecc 2025-06-09 11:12:34 +08:00
parent 123cc92756
commit 0558d67240
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
28 changed files with 28 additions and 28 deletions

View File

@ -21,7 +21,7 @@ class libffi extends LinuxLibraryBase
$arch = getenv('SPC_ARCH');
shell()->cd($this->source_dir)
->initLibBuildEnv($this)
->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -41,7 +41,7 @@ class libpng extends LinuxLibraryBase
'aarch64' => '--enable-arm-neon ',
default => '',
};
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec('chmod +x ./configure')
->exec('chmod +x ./install-sh')
->exec(

View File

@ -64,7 +64,7 @@ class openssl extends LinuxLibraryBase
$clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : '';
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
"{$env} ./Configure no-shared {$extra} " .
'--prefix=/ ' .

View File

@ -49,7 +49,7 @@ class openssl extends MacOSLibraryBase
}
$arch = getenv('SPC_ARCH');
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
"./Configure no-shared {$extra} " .
'--prefix=/ ' . // use prefix=/

View File

@ -13,7 +13,7 @@ trait attr
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['CFLAGS' => "-I{$this->getIncludeDir()}", 'LDFLAGS' => "-L{$this->getLibDir()}"])
->exec('libtoolize --force --copy')
->exec('./autogen.sh || autoreconf -if')

View File

@ -16,7 +16,7 @@ trait bzip2
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec("make PREFIX='" . BUILD_ROOT_PATH . "' clean")
->exec("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a")
->exec('cp libbz2.a ' . BUILD_LIB_PATH)

View File

@ -16,7 +16,7 @@ trait gettext
$cflags = $this->builder->getOption('enable-zts') ? '-lpthread -D_REENTRANT' : '';
$ldflags = $this->builder->getOption('enable-zts') ? '-lpthread' : '';
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['CFLAGS' => $cflags, 'LDFLAGS' => $ldflags])
->exec(
'./configure ' .

View File

@ -15,7 +15,7 @@ trait gmp
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static --disable-shared ' .

View File

@ -46,7 +46,7 @@ trait imagemagick
// libxml iconv patch
$required_libs .= $this instanceof MacOSLibraryBase ? ('-liconv') : '';
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['LDFLAGS' => $ldflags, 'LIBS' => $required_libs, 'PKG_CONFIG' => '$PKG_CONFIG --static'])
->exec(
'./configure ' .

View File

@ -26,7 +26,7 @@ trait ldap
$alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '--enable-argon2=no ';
f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['LDFLAGS' => "-L{$this->getLibDir()}"])
->exec(
$this->builder->makeAutoconfFlags(AUTOCONF_CPPFLAGS) .

View File

@ -29,7 +29,7 @@ trait libacl
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['CFLAGS' => "-I{$this->getIncludeDir()}", 'LDFLAGS' => "-L{$this->getLibDir()}"])
->exec('libtoolize --force --copy')
->exec('./autogen.sh || autoreconf -if')

View File

@ -10,7 +10,7 @@ trait libargon2
{
protected function build()
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec("make PREFIX='' clean")
->exec("make -j{$this->builder->concurrency} PREFIX=''")
->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);

View File

@ -24,7 +24,7 @@ trait libcares
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec('./configure --prefix= --enable-static --disable-shared --disable-tests --with-pic')
->exec("make -j {$this->builder->concurrency}")
->exec('make install DESTDIR=' . BUILD_ROOT_PATH);

View File

@ -10,7 +10,7 @@ trait libiconv
{
[,,$destdir] = SEPARATED_PATH;
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -17,7 +17,7 @@ trait liblz4
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec("make PREFIX='' clean")
->exec("make -j{$this->builder->concurrency} PREFIX=''")
->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);

View File

@ -22,7 +22,7 @@ trait libtiff
// We disabled lzma, zstd, webp, libdeflate by default to reduce the size of the binary
$extra_libs .= ' --disable-lzma --disable-zstd --disable-webp --disable-libdeflate';
$shell = shell()->cd($this->source_dir)->initLibBuildEnv($this)
$shell = shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static --disable-shared ' .

View File

@ -24,7 +24,7 @@ trait libxslt
$required_libs .= ' ' . $dep->getStaticLibFiles();
}
}
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv([
'CFLAGS' => "-I{$this->getIncludeDir()}",
'LDFLAGS' => "-L{$this->getLibDir()}",

View File

@ -11,7 +11,7 @@ trait ncurses
protected function build(): void
{
$filelist = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -40,7 +40,7 @@ trait nghttp2
[,,$destdir] = SEPARATED_PATH;
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -15,7 +15,7 @@ trait nghttp3
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -30,7 +30,7 @@ trait ngtcp2
$args .= ' --with-libbrotlienc=yes LIBBROTLIENC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIENC_LIBS="' . $brotli->getStaticLibFiles() . '"';
}
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static ' .

View File

@ -17,7 +17,7 @@ trait onig
{
[,,$destdir] = SEPARATED_PATH;
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec('./configure --enable-static --disable-shared --prefix=')
->exec('make clean')
->exec("make -j{$this->builder->concurrency}")

View File

@ -13,7 +13,7 @@ trait pkgconfig
$cflags = PHP_OS_FAMILY !== 'Linux' ? "{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion" : '';
$ldflags = !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? '' : '--static';
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->appendEnv(['CFLAGS' => $cflags, 'LDFLAGS' => $ldflags])
->exec(
'./configure ' .

View File

@ -15,7 +15,7 @@ trait readline
*/
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec(
'./configure ' .
'--enable-static=yes ' .

View File

@ -8,7 +8,7 @@ trait sqlite
{
protected function build(): void
{
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec('./configure --enable-static --disable-shared --prefix=')
->exec('make clean')
->exec("make -j{$this->builder->concurrency}")

View File

@ -17,7 +17,7 @@ trait zlib
{
[,,$destdir] = SEPARATED_PATH;
shell()->cd($this->source_dir)->initLibBuildEnv($this)
shell()->cd($this->source_dir)->initializeEnv($this)
->exec('./configure --static --prefix=')
->exec('make clean')
->exec("make -j{$this->builder->concurrency}")

View File

@ -64,7 +64,7 @@ class UnixShell
*
* @param BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library Library class
*/
public function initLibBuildEnv(BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library): UnixShell
public function initializeEnv(BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library): UnixShell
{
$this->setEnv([
'CFLAGS' => $library->getLibExtraCFlags(),

View File

@ -34,7 +34,7 @@ class UnixCMakeExecutor extends Executor
}
// prepare shell
$shell = shell()->cd($this->build_dir)->initLibBuildEnv($this->library);
$shell = shell()->cd($this->build_dir)->initializeEnv($this->library);
// config
$this->steps >= 1 && $shell->exec("cmake {$this->getConfigureArgs()} {$this->getDefaultCMakeArgs()} {$build_pos}");