From bd8f91d466d8b9db48a0e6f7b108bb944f059d33 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 7 Apr 2024 15:52:24 +0800 Subject: [PATCH] add env manager --- src/SPC/ConsoleApplication.php | 2 +- src/SPC/builder/LibraryBase.php | 5 + src/SPC/builder/linux/LinuxBuilder.php | 138 +++++--------- src/SPC/builder/linux/library/openssl.php | 8 +- src/SPC/builder/macos/MacOSBuilder.php | 85 +++------ src/SPC/builder/macos/library/openssl.php | 3 +- src/SPC/builder/traits/UnixLibraryTrait.php | 15 ++ src/SPC/builder/unix/library/brotli.php | 7 +- src/SPC/builder/unix/library/bzip2.php | 5 +- src/SPC/builder/unix/library/curl.php | 7 +- src/SPC/builder/unix/library/freetype.php | 9 +- src/SPC/builder/unix/library/gettext.php | 9 +- src/SPC/builder/unix/library/gmp.php | 7 +- src/SPC/builder/unix/library/imagemagick.php | 15 +- src/SPC/builder/unix/library/ldap.php | 10 +- src/SPC/builder/unix/library/libargon2.php | 5 +- src/SPC/builder/unix/library/libavif.php | 7 +- src/SPC/builder/unix/library/libcares.php | 5 +- src/SPC/builder/unix/library/libevent.php | 5 +- src/SPC/builder/unix/library/pkgconfig.php | 15 +- src/SPC/builder/windows/WindowsBuilder.php | 14 +- src/SPC/command/BuildCliCommand.php | 22 ++- src/SPC/util/GlobalEnvManager.php | 187 +++++++++++++++++++ src/SPC/util/UnixShell.php | 7 +- 24 files changed, 389 insertions(+), 203 deletions(-) create mode 100644 src/SPC/util/GlobalEnvManager.php diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index 6cdc73bf..09b6b622 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -25,7 +25,7 @@ use Symfony\Component\Console\Command\ListCommand; */ final class ConsoleApplication extends Application { - public const VERSION = '2.1.7'; + public const VERSION = '2.2.0'; public function __construct() { diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php index 51ab7e30..cff8ff2b 100644 --- a/src/SPC/builder/LibraryBase.php +++ b/src/SPC/builder/LibraryBase.php @@ -206,4 +206,9 @@ abstract class LibraryBase } logger()->debug('enabling ' . static::NAME . " without {$name}"); } + + protected function getSnakeCaseName(): string + { + return str_replace('-', '_', static::NAME); + } } diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 7d200d17..b7abf159 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -11,68 +11,42 @@ use SPC\exception\RuntimeException; use SPC\exception\WrongUsageException; use SPC\store\FileSystem; use SPC\store\SourcePatcher; +use SPC\util\GlobalEnvManager; class LinuxBuilder extends UnixBuilderBase { - /** @var array Tune cflags */ - public array $tune_c_flags; - /** @var bool Micro patch phar flag */ private bool $phar_patched = false; /** * @throws FileSystemException - * @throws RuntimeException * @throws WrongUsageException */ public function __construct(array $options = []) { $this->options = $options; - // ---------- set necessary options ---------- - // set C/C++ compilers (default: alpine: gcc, others: musl-cross-make) - if (SystemUtil::isMuslDist()) { - f_putenv("CC={$this->getOption('cc', 'gcc')}"); - f_putenv("CXX={$this->getOption('cxx', 'g++')}"); - f_putenv("AR={$this->getOption('ar', 'ar')}"); - f_putenv("LD={$this->getOption('ld', 'ld.gold')}"); - } else { - $arch = arch2gnu(php_uname('m')); - f_putenv("CC={$this->getOption('cc', "{$arch}-linux-musl-gcc")}"); - f_putenv("CXX={$this->getOption('cxx', "{$arch}-linux-musl-g++")}"); - f_putenv("AR={$this->getOption('ar', "{$arch}-linux-musl-ar")}"); - f_putenv("LD={$this->getOption('ld', 'ld.gold')}"); - f_putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . BUILD_ROOT_PATH . '/bin:' . getenv('PATH')); - - // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused) - $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib"); - $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib"); - - // check musl-cross make installed if we use musl-cross-make - if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc")) { - throw new WrongUsageException('musl-cross-make not installed, please install it first. (You can use `doctor` command to install it)'); - } + // check musl-cross make installed if we use musl-cross-make + $arch = arch2gnu(php_uname('m')); + if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc")) { + throw new WrongUsageException('musl-cross-make not installed, please install it first. (You can use `doctor` command to install it)'); } - // set PKG_CONFIG - f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config'); - // set PKG_CONFIG_PATH - f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig'); + // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused) + $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib"); + $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib"); - // set arch (default: current) - $this->setOptionIfNotExist('arch', php_uname('m')); - $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch'))); + GlobalEnvManager::init($this); // concurrency - $this->concurrency = SystemUtil::getCpuCount(); + $this->concurrency = intval(getenv('SPC_CONCURRENCY')); // cflags - $this->arch_c_flags = SystemUtil::getArchCFlags(getenv('CC'), $this->getOption('arch')); - $this->arch_cxx_flags = SystemUtil::getArchCFlags(getenv('CXX'), $this->getOption('arch')); - $this->tune_c_flags = SystemUtil::checkCCFlags(SystemUtil::getTuneCFlags($this->getOption('arch')), getenv('CC')); + $this->arch_c_flags = getenv('SPC_DEFAULT_C_FLAGS'); + $this->arch_cxx_flags = getenv('SPC_DEFAULT_CXX_FLAGS'); // cmake toolchain $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile( 'Linux', - $this->getOption('arch'), + $arch, $this->arch_c_flags, getenv('CC'), getenv('CXX'), @@ -124,8 +98,8 @@ class LinuxBuilder extends UnixBuilderBase public function buildPHP(int $build_target = BUILD_TARGET_NONE): void { // ---------- Update extra-libs ---------- - $extra_libs = $this->getOption('extra-libs', ''); - // non-bloat linking + $extra_libs = getenv('SPC_EXTRA_LIBS') ?: ''; + // bloat means force-load all static libraries, even if they are not used if (!$this->getOption('bloat', false)) { $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles()); } else { @@ -133,21 +107,13 @@ class LinuxBuilder extends UnixBuilderBase } // add libstdc++, some extensions or libraries need it $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lstdc++ ' : ''); - $this->setOption('extra-libs', $extra_libs); + f_putenv('SPC_EXTRA_LIBS=' . $extra_libs); $cflags = $this->arch_c_flags; - // prepare build php envs - $envs_build_php = SystemUtil::makeEnvVarString([ - 'CFLAGS' => $cflags, - 'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, - 'LDFLAGS' => '-L' . BUILD_LIB_PATH, - 'LIBS' => '-ldl -lpthread', - ]); - $this->emitPatchPoint('before-php-buildconf'); SourcePatcher::patchBeforeBuildconf($this); - shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force'); + shell()->cd(SOURCE_PATH . '/php-src')->exec(getenv('SPC_CMD_PREFIX_PHP_BUILDCONF')); $this->emitPatchPoint('before-php-configure'); SourcePatcher::patchBeforeConfigure($this); @@ -169,20 +135,31 @@ class LinuxBuilder extends UnixBuilderBase $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO; $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED; + // prepare build php envs + $envs_build_php = SystemUtil::makeEnvVarString([ + 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), + 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), + 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), + 'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'), + ]); + // upx pack and strip for micro if ($this->getOption('with-upx-pack', false)) { + // with upx pack always need strip FileSystem::replaceFileRegex( SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', '/POST_MICRO_BUILD_COMMANDS=.*/', - 'POST_MICRO_BUILD_COMMANDS=\$(STRIP) \$(MICRO_STRIP_FLAGS) \$(SAPI_MICRO_PATH) && ' . $this->getOption('upx-exec') . ' --best \$(SAPI_MICRO_PATH)', + 'POST_MICRO_BUILD_COMMANDS=\$(STRIP) \$(MICRO_STRIP_FLAGS) \$(SAPI_MICRO_PATH) && ' . getenv('UPX_EXEC') . ' --best \$(SAPI_MICRO_PATH)', ); } elseif (!$this->getOption('no-strip', false)) { + // not-no-strip means strip (default behavior) FileSystem::replaceFileRegex( SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', '/POST_MICRO_BUILD_COMMANDS=.*/', 'POST_MICRO_BUILD_COMMANDS=\$(STRIP) \$(MICRO_STRIP_FLAGS) \$(SAPI_MICRO_PATH)', ); } else { + // just no strip FileSystem::replaceFileRegex( SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', '/POST_MICRO_BUILD_COMMANDS=.*/', @@ -193,14 +170,7 @@ class LinuxBuilder extends UnixBuilderBase shell()->cd(SOURCE_PATH . '/php-src') ->exec( "{$this->getOption('ld_library_path')} " . - './configure ' . - '--prefix= ' . - '--with-valgrind=no ' . - '--enable-shared=no ' . - '--enable-static=yes ' . - '--disable-all ' . - '--disable-cgi ' . - '--disable-phpdbg ' . + getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' . ($enableCli ? '--enable-cli ' : '--disable-cli ') . ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') . ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') . @@ -252,15 +222,15 @@ class LinuxBuilder extends UnixBuilderBase */ protected function buildCli(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') - ->exec("make -j{$this->concurrency} {$vars} cli"); + ->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} cli"); if ($this->getOption('with-upx-pack')) { shell()->cd(SOURCE_PATH . '/php-src/sapi/cli') ->exec('strip --strip-all php') - ->exec($this->getOption('upx-exec') . ' --best php'); + ->exec(getenv('UPX_EXEC') . ' --best php'); } elseif (!$this->getOption('no-strip', false)) { shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-all php'); } @@ -285,12 +255,16 @@ class LinuxBuilder extends UnixBuilderBase SourcePatcher::patchMicro(['phar']); } - $vars = SystemUtil::makeEnvVarString($this->getBuildVars([ - 'EXTRA_CFLAGS' => $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '', - ])); + $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : ''; + $vars = $this->getMakeExtraVars(); + + // patch fake cli for micro + $vars['EXTRA_CFLAGS'] .= $enable_fake_cli; + $vars = SystemUtil::makeEnvVarString($vars); + shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') - ->exec("make -j{$this->concurrency} {$vars} micro"); + ->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} micro"); $this->deployBinary(BUILD_TARGET_MICRO); @@ -307,15 +281,15 @@ class LinuxBuilder extends UnixBuilderBase */ protected function buildFpm(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') - ->exec("make -j{$this->concurrency} {$vars} fpm"); + ->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} fpm"); if ($this->getOption('with-upx-pack')) { shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm') ->exec('strip --strip-all php-fpm') - ->exec($this->getOption('upx-exec') . ' --best php-fpm'); + ->exec(getenv('UPX_EXEC') . ' --best php-fpm'); } elseif (!$this->getOption('no-strip', false)) { shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')->exec('strip --strip-all php-fpm'); } @@ -329,29 +303,19 @@ class LinuxBuilder extends UnixBuilderBase */ protected function buildEmbed(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); - shell() - ->cd(SOURCE_PATH . '/php-src') + shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') - ->exec('make INSTALL_ROOT=' . BUILD_ROOT_PATH . " -j{$this->concurrency} {$vars} install"); + ->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install"); } - private function getBuildVars($input = []): array + private function getMakeExtraVars(): array { - $use_lld = ''; - if (str_ends_with(getenv('CC'), 'clang') && SystemUtil::findCommand('lld')) { - $use_lld = '-Xcompiler -fuse-ld=lld'; - } - $optimization = $this->getOption('no-strip', false) ? '-g -O0' : '-g0 -Os'; - $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : ''; - $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : ''; - $ldflags = isset($input['EXTRA_LDFLAGS_PROGRAM']) && $input['EXTRA_LDFLAGS_PROGRAM'] ? " {$input['EXTRA_LDFLAGS_PROGRAM']}" : ''; - $tune_c_flags = implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)); return [ - 'EXTRA_CFLAGS' => "{$optimization} -fno-ident -fPIE {$tune_c_flags}{$cflags}", - 'EXTRA_LIBS' => "{$this->getOption('extra-libs', '')} {$libs}", - 'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static{$ldflags}", + 'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), + 'EXTRA_LIBS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS'), + 'EXTRA_LDFLAGS_PROGRAM' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'), ]; } } diff --git a/src/SPC/builder/linux/library/openssl.php b/src/SPC/builder/linux/library/openssl.php index 31dcd9ff..9c3b043e 100644 --- a/src/SPC/builder/linux/library/openssl.php +++ b/src/SPC/builder/linux/library/openssl.php @@ -42,8 +42,7 @@ class openssl extends LinuxLibraryBase $extra = ''; $ex_lib = '-ldl -pthread'; - $env = "CFLAGS='{$this->builder->arch_c_flags}'"; - $env .= " CC='" . getenv('CC') . ' -static -idirafter ' . BUILD_INCLUDE_PATH . + $env = "CC='" . getenv('CC') . ' -static -idirafter ' . BUILD_INCLUDE_PATH . ' -idirafter /usr/include/ ' . ' -idirafter /usr/include/' . $this->builder->getOption('arch') . '-linux-gnu/ ' . "' "; @@ -64,7 +63,8 @@ class openssl extends LinuxLibraryBase $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : ''; shell()->cd($this->source_dir) - ->exec( + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags() ?: $this->builder->arch_c_flags, 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( "{$env} ./Configure no-shared {$extra} " . '--prefix=/ ' . '--libdir=lib ' . @@ -74,7 +74,7 @@ class openssl extends LinuxLibraryBase "linux-{$this->builder->getOption('arch')}{$clang_postfix}" ) ->exec('make clean') - ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"") + ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"") ->exec("make install_sw DESTDIR={$destdir}"); $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']); // patch for openssl 3.3.0+ diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php index def7d8b0..522c12d3 100644 --- a/src/SPC/builder/macos/MacOSBuilder.php +++ b/src/SPC/builder/macos/MacOSBuilder.php @@ -11,6 +11,7 @@ use SPC\exception\RuntimeException; use SPC\exception\WrongUsageException; use SPC\store\FileSystem; use SPC\store\SourcePatcher; +use SPC\util\GlobalEnvManager; class MacOSBuilder extends UnixBuilderBase { @@ -26,28 +27,15 @@ class MacOSBuilder extends UnixBuilderBase { $this->options = $options; - // ---------- set necessary options ---------- - // set C Compiler (default: clang) - f_putenv('CC=' . $this->getOption('cc', 'clang')); - // set C++ Composer (default: clang++) - f_putenv('CXX=' . $this->getOption('cxx', 'clang++')); - // set PATH - f_putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH')); - // set PKG_CONFIG - f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config'); - // set PKG_CONFIG_PATH - f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig/'); + // apply global environment variables + GlobalEnvManager::init($this); - // set arch (default: current) - $this->setOptionIfNotExist('arch', php_uname('m')); - $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch'))); - - // ---------- set necessary compile environments ---------- + // ---------- set necessary compile vars ---------- // concurrency - $this->concurrency = SystemUtil::getCpuCount(); + $this->concurrency = intval(getenv('SPC_CONCURRENCY')); // cflags - $this->arch_c_flags = SystemUtil::getArchCFlags($this->getOption('arch')); - $this->arch_cxx_flags = SystemUtil::getArchCFlags($this->getOption('arch')); + $this->arch_c_flags = getenv('SPC_DEFAULT_C_FLAGS'); + $this->arch_cxx_flags = getenv('SPC_DEFAULT_CXX_FLAGS'); // cmake toolchain $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile('Darwin', $this->getOption('arch'), $this->arch_c_flags); @@ -123,24 +111,25 @@ class MacOSBuilder extends UnixBuilderBase */ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void { + $extra_libs = getenv('SPC_EXTRA_LIBS') ?: ''; // ---------- Update extra-libs ---------- - $extra_libs = $this->getOption('extra-libs', ''); // add macOS frameworks $extra_libs .= (empty($extra_libs) ? '' : ' ') . $this->getFrameworks(true); // add libc++, some extensions or libraries need it (C++ cannot be linked statically) $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lc++ ' : ''); + // bloat means force-load all static libraries, even if they are not used if (!$this->getOption('bloat', false)) { $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles()); } else { logger()->info('bloat linking'); $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', array_map(fn ($x) => "-Wl,-force_load,{$x}", array_filter($this->getAllStaticLibFiles()))); } - $this->setOption('extra-libs', $extra_libs); + f_putenv('SPC_EXTRA_LIBS=' . $extra_libs); $this->emitPatchPoint('before-php-buildconf'); SourcePatcher::patchBeforeBuildconf($this); - shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force'); + shell()->cd(SOURCE_PATH . '/php-src')->exec(getenv('SPC_CMD_PREFIX_PHP_BUILDCONF')); $this->emitPatchPoint('before-php-configure'); SourcePatcher::patchBeforeConfigure($this); @@ -155,9 +144,9 @@ class MacOSBuilder extends UnixBuilderBase // prepare build php envs $envs_build_php = SystemUtil::makeEnvVarString([ - 'CFLAGS' => " {$this->arch_c_flags} -Werror=unknown-warning-option ", - 'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, - 'LDFLAGS' => '-L' . BUILD_LIB_PATH, + 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), + 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), + 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), ]); if ($this->getLib('postgresql')) { @@ -170,14 +159,7 @@ class MacOSBuilder extends UnixBuilderBase shell()->cd(SOURCE_PATH . '/php-src') ->exec( - './configure ' . - '--prefix= ' . - '--with-valgrind=no ' . // Not detect memory leak - '--enable-shared=no ' . - '--enable-static=yes ' . - '--disable-all ' . - '--disable-cgi ' . - '--disable-phpdbg ' . + getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' . ($enableCli ? '--enable-cli ' : '--disable-cli ') . ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') . ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') . @@ -227,10 +209,10 @@ class MacOSBuilder extends UnixBuilderBase */ protected function buildCli(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); $shell = shell()->cd(SOURCE_PATH . '/php-src'); - $shell->exec("make -j{$this->concurrency} {$vars} cli"); + $shell->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} cli"); if (!$this->getOption('no-strip', false)) { $shell->exec('dsymutil -f sapi/cli/php')->exec('strip sapi/cli/php'); } @@ -255,18 +237,17 @@ class MacOSBuilder extends UnixBuilderBase } $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : ''; - $vars = [ - // with debug information, optimize for size, remove identifiers, patch fake cli for micro - 'EXTRA_CFLAGS' => '-g -Os -fno-ident' . $enable_fake_cli, - ]; - $vars = $this->getBuildVars($vars); + $vars = $this->getMakeExtraVars(); + + // patch fake cli for micro + $vars['EXTRA_CFLAGS'] .= $enable_fake_cli; if (!$this->getOption('no-strip', false)) { $vars['STRIP'] = 'dsymutil -f '; } $vars = SystemUtil::makeEnvVarString($vars); - shell()->cd(SOURCE_PATH . '/php-src') - ->exec("make -j{$this->concurrency} {$vars} micro"); + shell()->cd(SOURCE_PATH . '/php-src')->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} micro"); + $this->deployBinary(BUILD_TARGET_MICRO); if ($this->phar_patched) { @@ -282,10 +263,10 @@ class MacOSBuilder extends UnixBuilderBase */ protected function buildFpm(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); $shell = shell()->cd(SOURCE_PATH . '/php-src'); - $shell->exec("make -j{$this->concurrency} {$vars} fpm"); + $shell->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} fpm"); if (!$this->getOption('no-strip', false)) { $shell->exec('dsymutil -f sapi/fpm/php-fpm')->exec('strip sapi/fpm/php-fpm'); } @@ -299,11 +280,10 @@ class MacOSBuilder extends UnixBuilderBase */ protected function buildEmbed(): void { - $vars = SystemUtil::makeEnvVarString($this->getBuildVars()); + $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); - shell() - ->cd(SOURCE_PATH . '/php-src') - ->exec('make INSTALL_ROOT=' . BUILD_ROOT_PATH . " -j{$this->concurrency} {$vars} install") + shell()->cd(SOURCE_PATH . '/php-src') + ->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install") // Workaround for https://github.com/php/php-src/issues/12082 ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o') ->exec('mkdir ' . BUILD_ROOT_PATH . '/lib/php-o') @@ -314,14 +294,11 @@ class MacOSBuilder extends UnixBuilderBase ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o'); } - private function getBuildVars($input = []): array + private function getMakeExtraVars(): array { - $optimization = $this->getOption('no-strip', false) ? '-g -O0' : '-g0 -Os'; - $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : ''; - $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : ''; return [ - 'EXTRA_CFLAGS' => "{$optimization} {$cflags} " . $this->getOption('x-extra-cflags'), - 'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv {$libs} " . $this->getOption('x-extra-libs'), + 'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), + 'EXTRA_LIBS' => getenv('SPC_EXTRA_LIBS') . ' ' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS'), ]; } } diff --git a/src/SPC/builder/macos/library/openssl.php b/src/SPC/builder/macos/library/openssl.php index cb9de460..b5753b8d 100644 --- a/src/SPC/builder/macos/library/openssl.php +++ b/src/SPC/builder/macos/library/openssl.php @@ -48,6 +48,7 @@ class openssl extends MacOSLibraryBase } shell()->cd($this->source_dir) + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) ->exec( "./Configure no-shared {$extra} " . '--prefix=/ ' . // use prefix=/ @@ -56,7 +57,7 @@ class openssl extends MacOSLibraryBase "darwin64-{$this->builder->getOption('arch')}-cc" ) ->exec('make clean') - ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"") + ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"") ->exec("make install_sw DESTDIR={$destdir}"); $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']); // patch for openssl 3.3.0+ diff --git a/src/SPC/builder/traits/UnixLibraryTrait.php b/src/SPC/builder/traits/UnixLibraryTrait.php index 9561663f..c40db0f4 100644 --- a/src/SPC/builder/traits/UnixLibraryTrait.php +++ b/src/SPC/builder/traits/UnixLibraryTrait.php @@ -99,4 +99,19 @@ trait UnixLibraryTrait } } } + + public function getLibExtraCFlags(): string + { + return getenv($this->getSnakeCaseName() . '_CFLAGS') ?: ''; + } + + public function getLibExtraLdFlags(): string + { + return getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: ''; + } + + public function getLibExtraLibs(): string + { + return getenv($this->getSnakeCaseName() . '_LIBS') ?: ''; + } } diff --git a/src/SPC/builder/unix/library/brotli.php b/src/SPC/builder/unix/library/brotli.php index 08eae3a1..e84c6577 100644 --- a/src/SPC/builder/unix/library/brotli.php +++ b/src/SPC/builder/unix/library/brotli.php @@ -18,14 +18,15 @@ trait brotli { FileSystem::resetDir($this->source_dir . '/build-dir'); shell()->cd($this->source_dir . '/build-dir') - ->exec( + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( 'cmake ' . "{$this->builder->makeCmakeArgs()} " . '-DBUILD_SHARED_LIBS=OFF ' . '..' ) - ->exec("cmake --build . -j {$this->builder->concurrency}") - ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); + ->execWithEnv("cmake --build . -j {$this->builder->concurrency}") + ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']); shell()->cd(BUILD_ROOT_PATH . '/lib')->exec('ln -sf libbrotlicommon.a libbrotli.a'); foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) { diff --git a/src/SPC/builder/unix/library/bzip2.php b/src/SPC/builder/unix/library/bzip2.php index 71990125..23428317 100644 --- a/src/SPC/builder/unix/library/bzip2.php +++ b/src/SPC/builder/unix/library/bzip2.php @@ -9,8 +9,9 @@ trait bzip2 protected function build(): void { shell()->cd($this->source_dir) - ->exec("make PREFIX='" . BUILD_ROOT_PATH . "' clean") - ->exec("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a") + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv("make PREFIX='" . BUILD_ROOT_PATH . "' clean") + ->execWithEnv("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a") ->exec('cp libbz2.a ' . BUILD_LIB_PATH) ->exec('cp bzlib.h ' . BUILD_INCLUDE_PATH); } diff --git a/src/SPC/builder/unix/library/curl.php b/src/SPC/builder/unix/library/curl.php index 643ecac1..1ace7218 100644 --- a/src/SPC/builder/unix/library/curl.php +++ b/src/SPC/builder/unix/library/curl.php @@ -51,10 +51,11 @@ trait curl FileSystem::resetDir($this->source_dir . '/build'); // compileļ¼ shell()->cd($this->source_dir . '/build') + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) ->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ../CMakeLists.txt') - ->exec("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DBUILD_LIBCURL_DOCS=OFF {$extra} ..") - ->exec("make -j{$this->builder->concurrency}") - ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); + ->execWithEnv("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DBUILD_LIBCURL_DOCS=OFF {$extra} ..") + ->execWithEnv("make -j{$this->builder->concurrency}") + ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH); // patch pkgconf $this->patchPkgconfPrefix(['libcurl.pc']); shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/') diff --git a/src/SPC/builder/unix/library/freetype.php b/src/SPC/builder/unix/library/freetype.php index 3158d828..6f91a3ec 100644 --- a/src/SPC/builder/unix/library/freetype.php +++ b/src/SPC/builder/unix/library/freetype.php @@ -26,15 +26,16 @@ trait freetype $suggested .= ' '; shell()->cd($this->source_dir) + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) ->exec('sh autogen.sh') - ->exec( + ->execWithEnv( './configure ' . '--enable-static --disable-shared --without-harfbuzz --prefix= ' . $suggested ) - ->exec('make clean') - ->exec("make -j{$this->builder->concurrency}") - ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); + ->execWithEnv('make clean') + ->execWithEnv("make -j{$this->builder->concurrency}") + ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['freetype2.pc']); FileSystem::replaceFileStr( BUILD_ROOT_PATH . '/lib/pkgconfig/freetype2.pc', diff --git a/src/SPC/builder/unix/library/gettext.php b/src/SPC/builder/unix/library/gettext.php index 3b2dbb30..6a1995c4 100644 --- a/src/SPC/builder/unix/library/gettext.php +++ b/src/SPC/builder/unix/library/gettext.php @@ -11,7 +11,8 @@ trait gettext $extra = $this->builder->getLib('ncurses') ? ('--with-libncurses-prefix=' . BUILD_ROOT_PATH . ' ') : ''; $extra .= $this->builder->getLib('libxml2') ? ('--with-libxml2-prefix=' . BUILD_ROOT_PATH . ' ') : ''; shell()->cd($this->source_dir) - ->exec( + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( './configure ' . '--enable-static ' . '--disable-shared ' . @@ -21,8 +22,8 @@ trait gettext '--with-libiconv-prefix=' . BUILD_ROOT_PATH . ' ' . '--prefix=' . BUILD_ROOT_PATH ) - ->exec('make clean') - ->exec("make -j{$this->builder->concurrency}") - ->exec('make install'); + ->execWithEnv('make clean') + ->execWithEnv("make -j{$this->builder->concurrency}") + ->execWithEnv('make install'); } } diff --git a/src/SPC/builder/unix/library/gmp.php b/src/SPC/builder/unix/library/gmp.php index f1902dde..0748c870 100644 --- a/src/SPC/builder/unix/library/gmp.php +++ b/src/SPC/builder/unix/library/gmp.php @@ -16,13 +16,14 @@ trait gmp protected function build(): void { shell()->cd($this->source_dir) - ->exec( + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( './configure ' . '--enable-static --disable-shared ' . '--prefix=' ) - ->exec('make clean') - ->exec("make -j{$this->builder->concurrency}") + ->execWithEnv('make clean') + ->execWithEnv("make -j{$this->builder->concurrency}") ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['gmp.pc']); } diff --git a/src/SPC/builder/unix/library/imagemagick.php b/src/SPC/builder/unix/library/imagemagick.php index a75969ac..ac011e5f 100644 --- a/src/SPC/builder/unix/library/imagemagick.php +++ b/src/SPC/builder/unix/library/imagemagick.php @@ -39,15 +39,18 @@ trait imagemagick } } - $ldflags = $this instanceof LinuxLibraryBase ? ('LDFLAGS="-static" ') : ''; + $ldflags = $this instanceof LinuxLibraryBase ? ('-static') : ''; // libxml iconv patch - $required_libs .= $this instanceof MacOSLibraryBase ? (' -liconv') : ''; + $required_libs .= $this instanceof MacOSLibraryBase ? ('-liconv') : ''; shell()->cd($this->source_dir) - ->exec( - 'PKG_CONFIG="$PKG_CONFIG --static" ' . - $ldflags . - "LIBS='{$required_libs}' " . + ->setEnv([ + 'CFLAGS' => $this->getLibExtraCFlags(), + 'LDFLAGS' => $this->getLibExtraLdFlags() ?: $ldflags, + 'LIBS' => $this->getLibExtraLibs() ?: $required_libs, + 'PKG_CONFIG' => '$PKG_CONFIG --static', + ]) + ->execWithEnv( './configure ' . '--enable-static --disable-shared ' . $extra . diff --git a/src/SPC/builder/unix/library/ldap.php b/src/SPC/builder/unix/library/ldap.php index d1807d89..a061ce7f 100644 --- a/src/SPC/builder/unix/library/ldap.php +++ b/src/SPC/builder/unix/library/ldap.php @@ -25,9 +25,15 @@ 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'); + $ldflags = '-L' . BUILD_LIB_PATH; shell()->cd($this->source_dir) - ->exec( - $this->builder->makeAutoconfFlags(AUTOCONF_LDFLAGS | AUTOCONF_CPPFLAGS) . + ->setEnv([ + 'CFLAGS' => $this->getLibExtraCFlags(), + 'LDFLAGS' => $this->getLibExtraLdFlags() ?: $ldflags, + 'LIBS' => $this->getLibExtraLibs(), + ]) + ->execWithEnv( + $this->builder->makeAutoconfFlags(AUTOCONF_CPPFLAGS) . ' ./configure ' . '--enable-static ' . '--disable-shared ' . diff --git a/src/SPC/builder/unix/library/libargon2.php b/src/SPC/builder/unix/library/libargon2.php index 222e8b43..8cdd1e63 100644 --- a/src/SPC/builder/unix/library/libargon2.php +++ b/src/SPC/builder/unix/library/libargon2.php @@ -11,9 +11,10 @@ trait libargon2 protected function build() { shell()->cd($this->source_dir) + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) ->exec("make PREFIX='' clean") - ->exec("make -j{$this->builder->concurrency} PREFIX=''") - ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); + ->execWithEnv("make -j{$this->builder->concurrency} PREFIX=''") + ->execWithEnv("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['libargon2.pc']); diff --git a/src/SPC/builder/unix/library/libavif.php b/src/SPC/builder/unix/library/libavif.php index 592899b2..c427094e 100644 --- a/src/SPC/builder/unix/library/libavif.php +++ b/src/SPC/builder/unix/library/libavif.php @@ -22,9 +22,10 @@ trait libavif FileSystem::resetDir($this->source_dir . '/build'); // Start build shell()->cd($this->source_dir . '/build') - ->exec("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF ..") - ->exec("cmake --build . -j {$this->builder->concurrency}") - ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF ..") + ->execWithEnv("cmake --build . -j {$this->builder->concurrency}") + ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH); // patch pkgconfig $this->patchPkgconfPrefix(['libavif.pc']); $this->cleanLaFiles(); diff --git a/src/SPC/builder/unix/library/libcares.php b/src/SPC/builder/unix/library/libcares.php index 6d570174..c57ef375 100644 --- a/src/SPC/builder/unix/library/libcares.php +++ b/src/SPC/builder/unix/library/libcares.php @@ -14,8 +14,9 @@ trait libcares protected function build(): void { shell()->cd($this->source_dir) - ->exec('./configure --prefix=' . BUILD_ROOT_PATH . ' --enable-static --disable-shared --disable-tests') - ->exec("make -j {$this->builder->concurrency}") + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv('./configure --prefix=' . BUILD_ROOT_PATH . ' --enable-static --disable-shared --disable-tests') + ->execWithEnv("make -j {$this->builder->concurrency}") ->exec('make install'); } } diff --git a/src/SPC/builder/unix/library/libevent.php b/src/SPC/builder/unix/library/libevent.php index d9b2d81b..b3114156 100644 --- a/src/SPC/builder/unix/library/libevent.php +++ b/src/SPC/builder/unix/library/libevent.php @@ -20,7 +20,8 @@ trait libevent FileSystem::resetDir($this->source_dir . '/build'); // Start build shell()->cd($this->source_dir . '/build') - ->exec( + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( 'cmake ' . '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' . "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " . @@ -33,7 +34,7 @@ trait libevent '-DEVENT__DISABLE_SAMPLES=ON ' . '..' ) - ->exec("cmake --build . -j {$this->builder->concurrency}") + ->execWithEnv("cmake --build . -j {$this->builder->concurrency}") ->exec('make install'); } } diff --git a/src/SPC/builder/unix/library/pkgconfig.php b/src/SPC/builder/unix/library/pkgconfig.php index eac7ab03..80510157 100644 --- a/src/SPC/builder/unix/library/pkgconfig.php +++ b/src/SPC/builder/unix/library/pkgconfig.php @@ -8,15 +8,12 @@ trait pkgconfig { protected function build(): void { - $macos_env = "CFLAGS='{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion' "; - $linux_env = 'LDFLAGS=--static '; + $cflags = PHP_OS_FAMILY === 'Darwin' ? "{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion" : ''; + $ldflags = PHP_OS_FAMILY === 'Darwin' ? '' : '--static'; shell()->cd($this->source_dir) - ->exec( - match (PHP_OS_FAMILY) { - 'Darwin' => $macos_env, - default => $linux_env, - } . + ->setEnv(['CFLAGS' => $this->getLibExtraCFlags() ?: $cflags, 'LDFLAGS' => $this->getLibExtraLdFlags() ?: $ldflags, 'LIBS' => $this->getLibExtraLibs()]) + ->execWithEnv( './configure ' . '--disable-shared ' . '--enable-static ' . @@ -30,8 +27,8 @@ trait pkgconfig '--without-pc-path' ) ->exec('make clean') - ->exec("make -j{$this->builder->concurrency}") - ->exec('make install-exec'); + ->execWithEnv("make -j{$this->builder->concurrency}") + ->execWithEnv('make install-exec'); shell()->exec('strip ' . BUILD_ROOT_PATH . '/bin/pkg-config'); } } diff --git a/src/SPC/builder/windows/WindowsBuilder.php b/src/SPC/builder/windows/WindowsBuilder.php index 2e5a2d0d..dff8b746 100644 --- a/src/SPC/builder/windows/WindowsBuilder.php +++ b/src/SPC/builder/windows/WindowsBuilder.php @@ -13,6 +13,7 @@ use SPC\store\FileSystem; use SPC\store\SourceManager; use SPC\store\SourcePatcher; use SPC\util\DependencyUtil; +use SPC\util\GlobalEnvManager; class WindowsBuilder extends BuilderBase { @@ -33,6 +34,8 @@ class WindowsBuilder extends BuilderBase { $this->options = $options; + GlobalEnvManager::init($this); + // ---------- set necessary options ---------- // set sdk (require visual studio 16 or 17) $vs = SystemUtil::findVisualStudio()['version']; @@ -42,7 +45,7 @@ class WindowsBuilder extends BuilderBase $this->zts = $this->getOption('enable-zts', false); // set concurrency - $this->concurrency = SystemUtil::getCpuCount(); + $this->concurrency = intval(getenv('SPC_CONCURRENCY')); // make cmake toolchain $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile(); @@ -59,9 +62,10 @@ class WindowsBuilder extends BuilderBase public function buildPHP(int $build_target = BUILD_TARGET_NONE): void { // ---------- Update extra-libs ---------- - $extra_libs = $this->getOption('extra-libs', ''); + $extra_libs = getenv('SPC_EXTRA_LIBS') ?: ''; $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles()); - $this->setOption('extra-libs', $extra_libs); + f_putenv('SPC_EXTRA_LIBS=' . $extra_libs); + $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI; $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM; $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO; @@ -80,7 +84,7 @@ class WindowsBuilder extends BuilderBase if ($this->getOption('with-upx-pack', false)) { if (!file_exists($makefile . '.originfile')) { copy($makefile, $makefile . '.originfile'); - FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', "_MICRO_UPX = {$this->getOption('upx-exec')} --best $(MICRO_SFX)\n$(MICRO_SFX):"); + FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', '_MICRO_UPX = ' . getenv('UPX_EXEC') . " --best $(MICRO_SFX)\n$(MICRO_SFX):"); FileSystem::replaceFileStr($makefile, '@$(_MICRO_MT)', "@$(_MICRO_MT)\n\t@$(_MICRO_UPX)"); } } elseif (file_exists($makefile . '.originfile')) { @@ -322,7 +326,7 @@ class WindowsBuilder extends BuilderBase // with-upx-pack for cli if ($this->getOption('with-upx-pack', false) && $type === BUILD_TARGET_CLI) { - cmd()->exec($this->getOption('upx-exec') . ' --best ' . escapeshellarg($src)); + cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src)); } logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file'); diff --git a/src/SPC/command/BuildCliCommand.php b/src/SPC/command/BuildCliCommand.php index 85d5e39c..cef61f99 100644 --- a/src/SPC/command/BuildCliCommand.php +++ b/src/SPC/command/BuildCliCommand.php @@ -10,6 +10,7 @@ use SPC\exception\WrongUsageException; use SPC\store\FileSystem; use SPC\store\SourcePatcher; use SPC\util\DependencyUtil; +use SPC\util\GlobalEnvManager; use SPC\util\LicenseDumper; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Input\InputArgument; @@ -117,7 +118,6 @@ class BuildCliCommand extends BuildCommand } if ($this->input->getOption('with-upx-pack') && in_array(PHP_OS_FAMILY, ['Linux', 'Windows'])) { $indent_texts['UPX Pack'] = 'enabled'; - $builder->setOption('upx-exec', FileSystem::convertPath(PKG_ROOT_PATH . '/bin/upx' . $suffix)); } try { $ver = $builder->getPHPVersion(); @@ -132,6 +132,7 @@ class BuildCliCommand extends BuildCommand $indent_texts['Extra Exts (' . count($not_included) . ')'] = implode(', ', $not_included); } $this->printFormatInfo($indent_texts); + $this->printFormatInfo($this->getDefinedEnvs(), true); logger()->notice('Build will start after 2s ...'); sleep(2); @@ -226,7 +227,18 @@ class BuildCliCommand extends BuildCommand return $rule; } - private function printFormatInfo(array $indent_texts): void + private function getDefinedEnvs(): array + { + $envs = GlobalEnvManager::getInitializedEnv(); + $final = []; + foreach ($envs as $env) { + $exp = explode('=', $env, 2); + $final['Init var [' . $exp[0] . ']'] = $exp[1]; + } + return $final; + } + + private function printFormatInfo(array $indent_texts, bool $debug = false): void { // calculate space count for every line $maxlen = 0; @@ -236,14 +248,14 @@ class BuildCliCommand extends BuildCommand foreach ($indent_texts as $k => $v) { if (is_string($v)) { /* @phpstan-ignore-next-line */ - logger()->info($k . ': ' . str_pad('', $maxlen - strlen($k)) . ConsoleColor::yellow($v)); + logger()->{$debug ? 'debug' : 'info'}($k . ': ' . str_pad('', $maxlen - strlen($k)) . ConsoleColor::yellow($v)); } elseif (is_array($v) && !is_assoc_array($v)) { $first = array_shift($v); /* @phpstan-ignore-next-line */ - logger()->info($k . ': ' . str_pad('', $maxlen - strlen($k)) . ConsoleColor::yellow($first)); + logger()->{$debug ? 'debug' : 'info'}($k . ': ' . str_pad('', $maxlen - strlen($k)) . ConsoleColor::yellow($first)); foreach ($v as $vs) { /* @phpstan-ignore-next-line */ - logger()->info(str_pad('', $maxlen + 2) . ConsoleColor::yellow($vs)); + logger()->{$debug ? 'debug' : 'info'}(str_pad('', $maxlen + 2) . ConsoleColor::yellow($vs)); } } } diff --git a/src/SPC/util/GlobalEnvManager.php b/src/SPC/util/GlobalEnvManager.php new file mode 100644 index 00000000..8753869c --- /dev/null +++ b/src/SPC/util/GlobalEnvManager.php @@ -0,0 +1,187 @@ + self::initWindowsEnv($builder), + 'Darwin' => self::initDarwinEnv($builder), + 'Linux' => self::initLinuxEnv($builder), + 'BSD' => 'TODO', + default => logger()->warning('Unknown OS: ' . PHP_OS_FAMILY), + }; + + // Init SPC env + self::initIfNotExists('SPC_CONCURRENCY', match (PHP_OS_FAMILY) { + 'Windows' => (string) WindowsSystemUtil::getCpuCount(), + 'Darwin' => (string) MacOSSystemUtil::getCpuCount(), + 'Linux' => (string) LinuxSystemUtil::getCpuCount(), + 'BSD' => (string) BSDSystemUtil::getCpuCount(), + default => '1', + }); + } + + private static function initWindowsEnv(BuilderBase $builder): void + { + // Windows need php-sdk binary tools + self::initIfNotExists('PHP_SDK_PATH', WORKING_DIR . DIRECTORY_SEPARATOR . 'php-sdk-binary-tools'); + } + + private static function initLinuxEnv(BuilderBase $builder): void + { + // Init C Compiler and C++ Compiler (alpine) + if (\SPC\builder\linux\SystemUtil::isMuslDist()) { + self::initIfNotExists('CC', 'gcc'); + self::initIfNotExists('CXX', 'g++'); + self::initIfNotExists('AR', 'ar'); + self::initIfNotExists('LD', 'ld.gold'); + } else { + $arch = arch2gnu(php_uname('m')); + self::initIfNotExists('CC', "{$arch}-linux-musl-gcc"); + self::initIfNotExists('CXX', "{$arch}-linux-musl-g++"); + self::initIfNotExists('AR', "{$arch}-linux-musl-ar"); + self::initIfNotExists('LD', 'ld.gold'); + self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH')); + } + + // Init arch-specific cflags + self::initIfNotExists('SPC_DEFAULT_C_FLAGS', ''); + self::initIfNotExists('SPC_DEFAULT_CXX_FLAGS', ''); + self::initIfNotExists('SPC_EXTRA_LIBS', ''); + + // Init linux-only env + self::initIfNotExists('UPX_EXEC', PKG_ROOT_PATH . '/bin/upx'); + self::initIfNotExists('GNU_ARCH', arch2gnu(php_uname('m'))); + + // optimization flags with different strip option + $php_extra_cflags_optimize = $builder->getOption('no-strip') ? '-g -O0' : '-g -Os'; + // optimization flags with different c compiler + $clang_use_lld = str_ends_with(getenv('CC'), 'clang') && LinuxSystemUtil::findCommand('lld') ? '-Xcompiler -fuse-ld=lld ' : ''; + + $init_spc_cmd_maps = [ + // Init default build command prefix + 'SPC_CMD_PREFIX_PHP_BUILDCONF' => './buildconf --force', + 'SPC_CMD_PREFIX_PHP_CONFIGURE' => $builder->getOption('ld_library_path') . ' ./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg', + 'SPC_CMD_PREFIX_PHP_MAKE' => 'make -j' . getenv('SPC_CONCURRENCY'), + // Init default build vars for build command + 'SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS'), + 'SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, + 'SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS' => '-L' . BUILD_LIB_PATH, + 'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread', + 'SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS' => $php_extra_cflags_optimize . ' -fno-ident -fPIE', + 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS' => '', + 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM' => $clang_use_lld . '-all-static', + ]; + + foreach ($init_spc_cmd_maps as $name => $value) { + self::initIfNotExists($name, $value); + } + + self::initUnixEnv($builder); + } + + private static function initDarwinEnv(BuilderBase $builder): void + { + // Init C Compiler and C++ Compiler + self::initIfNotExists('CC', 'clang'); + self::initIfNotExists('CXX', 'clang++'); + + // Init arch-specific cflags + self::initIfNotExists('SPC_DEFAULT_C_FLAGS', match (php_uname('m')) { + 'arm64', 'aarch64' => '--target=arm64-apple-darwin', + default => '--target=x86_64-apple-darwin', + }); + // Init arch-specific cxxflags + self::initIfNotExists('SPC_DEFAULT_CXX_FLAGS', match (php_uname('m')) { + 'arm64', 'aarch64' => '--target=arm64-apple-darwin', + default => '--target=x86_64-apple-darwin', + }); + + // Init extra libs (will be appended before `before-php-buildconf` event point) + self::initIfNotExists('SPC_EXTRA_LIBS', ''); + + $init_spc_cmd_maps = [ + // Init default build command prefix + 'SPC_CMD_PREFIX_PHP_BUILDCONF' => './buildconf --force', + 'SPC_CMD_PREFIX_PHP_CONFIGURE' => './configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg', + 'SPC_CMD_PREFIX_PHP_MAKE' => 'make -j' . getenv('SPC_CONCURRENCY'), + // Init default build vars for build command + 'SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS') . ' -Werror=unknown-warning-option', + 'SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, + 'SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS' => '-L' . BUILD_LIB_PATH, + 'SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS' => $builder->getOption('no-strip') ? '-g -O0' : '-g -Os', + 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS' => '-lresolv', + ]; + foreach ($init_spc_cmd_maps as $name => $value) { + self::initIfNotExists($name, $value); + } + + self::initUnixEnv($builder); + } + + private static function initUnixEnv(BuilderBase $builder): void + { + self::putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH')); + self::putenv('PKG_CONFIG=' . BUILD_BIN_PATH . '/pkg-config'); + self::putenv('PKG_CONFIG_PATH=' . BUILD_ROOT_PATH . '/lib/pkgconfig'); + } + + /** + * Initialize the environment variable if it does not exist + * + * @param string $name Environment variable name + * @param string $value Environment variable value + */ + private static function initIfNotExists(string $name, string $value): void + { + if (($val = getenv($name)) === false) { + self::putenv($name . '=' . $value); + } else { + logger()->debug("env [{$name}] existing: {$val}"); + } + } + + private static function putenv(string $val): void + { + f_putenv($val); + self::$env_cache[] = $val; + } +} diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php index 2c0ba5d1..d26425f4 100644 --- a/src/SPC/util/UnixShell.php +++ b/src/SPC/util/UnixShell.php @@ -62,7 +62,12 @@ class UnixShell public function setEnv(array $env): UnixShell { - $this->env = array_merge($this->env, $env); + foreach ($env as $k => $v) { + if ($v === '') { + continue; + } + $this->env[$k] = $v; + } return $this; }