<

src/SPC/builder/BuilderBase.php

@@ -14,6 +14,7 @@ use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\LockFile;
 use SPC\store\SourceManager;
+use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
 
 abstract class BuilderBase
@@ -203,6 +204,8 @@ abstract class BuilderBase
             $this->emitPatchPoint('before-exts-extract');
             SourceManager::initSource(exts: [...$static_extensions, ...$shared_extensions]);
             $this->emitPatchPoint('after-exts-extract');
+            // patch micro
+            SourcePatcher::patchMicro();
         }
 
         foreach ([...$static_extensions, ...$shared_extensions] as $extension) {

src/SPC/builder/Extension.php

@@ -11,6 +11,7 @@ use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;
 
 class Extension
 {
@@ -545,6 +546,11 @@ class Extension
                 $sharedLibString .= '-l' . $lib . ' ';
             }
         }
+        // move static libstdc++ to shared if we are on non-full-static build target
+        if (!SPCTarget::isStatic() && in_array(SPCTarget::getLibc(), SPCTarget::LIBC_LIST)) {
+            $staticLibString .= ' -lstdc++';
+            $sharedLibString = str_replace('-lstdc++', '', $sharedLibString);
+        }
         return [trim($staticLibString), trim($sharedLibString)];
     }
 

src/SPC/builder/extension/imagick.php

@@ -12,17 +12,7 @@ class imagick extends Extension
 {
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' ac_cv_func_omp_pause_resource_all=no';
-    }
-
-    protected function getStaticAndSharedLibs(): array
-    {
-        // on centos 7, it will use the symbol _ZTINSt6thread6_StateE, which is not defined in system libstdc++.so.6
-        [$static, $shared] = parent::getStaticAndSharedLibs();
-        if (str_contains(getenv('CC'), 'devtoolset-10')) {
-            $static .= ' -lstdc++';
-            $shared = str_replace('-lstdc++', '', $shared);
-        }
-        return [$static, $shared];
+        $disable_omp = ' ac_cv_func_omp_pause_resource_all=no';
+        return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $disable_omp;
     }
 }

src/SPC/builder/linux/LinuxBuilder.php

@@ -25,22 +25,8 @@ class LinuxBuilder extends UnixBuilderBase
     {
         $this->options = $options;
 
-        // check musl-cross make installed if we use musl-cross-make
-        $arch = arch2gnu(php_uname('m'));
-
         GlobalEnvManager::init();
-
-        if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist() && !str_contains((string) getenv('CC'), 'zig')) {
-            $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\"");
-            $configure = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
-            $configure = "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\" " . $configure;
-            GlobalEnvManager::putenv("SPC_CMD_PREFIX_PHP_CONFIGURE={$configure}");
-
-            if (!file_exists("/usr/local/musl/{$arch}-linux-musl/lib/libc.a")) {
-                throw new WrongUsageException('You are building with musl-libc target in glibc distro, but musl-toolchain is not installed, please install musl-toolchain first. (You can use `doctor` command to install it)');
-            }
-        }
+        GlobalEnvManager::afterInit();
 
         // concurrency
         $this->concurrency = intval(getenv('SPC_CONCURRENCY'));
@@ -104,10 +90,6 @@ class LinuxBuilder extends UnixBuilderBase
             $zts = '';
         }
         $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : '';
-        $cc = trim(getenv('CC'));
-        if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) {
-            f_putenv("CC={$cc} -fno-sanitize=undefined");
-        }
 
         $config_file_path = $this->getOption('with-config-file-path', false) ?
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
@@ -139,9 +121,6 @@ class LinuxBuilder extends UnixBuilderBase
         }
 
         $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
-        if ($embed_type !== 'static' && getenv('SPC_LIBC') === 'musl' && getenv('SPC_LIBC_LINKAGE') === '-static') {
-            throw new WrongUsageException('Musl libc does not support dynamic linking of PHP embed!');
-        }
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
                 getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
@@ -183,9 +162,6 @@ class LinuxBuilder extends UnixBuilderBase
             }
             $this->buildEmbed();
         }
-        if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) {
-            f_putenv("CC={$cc}");
-        }
         if ($enableFrankenphp) {
             logger()->info('building frankenphp');
             $this->buildFrankenphp();

src/SPC/builder/linux/SystemUtil.php

@@ -192,12 +192,12 @@ class SystemUtil
     /**
      * Get libc version string from ldd
      */
-    public static function getLibcVersionIfExists(): ?string
+    public static function getLibcVersionIfExists(string $libc): ?string
     {
         if (self::$libc_version !== null) {
             return self::$libc_version;
         }
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'glibc') {
+        if ($libc === 'glibc') {
             $result = shell()->execWithResult('ldd --version', false);
             if ($result[0] !== 0) {
                 return null;
@@ -212,7 +212,7 @@ class SystemUtil
             }
             return null;
         }
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
+        if ($libc === 'musl') {
             if (self::isMuslDist()) {
                 $result = shell()->execWithResult('ldd 2>&1', false);
             } else {

src/SPC/builder/linux/library/icu.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\linux\library;
 
 use SPC\store\FileSystem;
+use SPC\util\SPCTarget;
 
 class icu extends LinuxLibraryBase
 {
@@ -16,7 +17,7 @@ class icu extends LinuxLibraryBase
     {
         $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -DPIC -fPIC"';
         $cxxflags = 'CXXFLAGS="-std=c++17 -DPIC -fPIC -fno-ident"';
-        $ldflags = getenv('SPC_LIBC') !== 'glibc' ? 'LDFLAGS="-static"' : '';
+        $ldflags = SPCTarget::isStatic() ? 'LDFLAGS="-static"' : '';
         shell()->cd($this->source_dir . '/source')->initializeEnv($this)
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

src/SPC/builder/macos/MacOSBuilder.php

@@ -29,6 +29,7 @@ class MacOSBuilder extends UnixBuilderBase
 
         // apply global environment variables
         GlobalEnvManager::init();
+        GlobalEnvManager::afterInit();
 
         // ---------- set necessary compile vars ----------
         // concurrency

src/SPC/builder/unix/UnixBuilderBase.php

@@ -19,6 +19,7 @@ use SPC\store\pkg\GoXcaddy;
 use SPC\util\DependencyUtil;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;
 
 abstract class UnixBuilderBase extends BuilderBase
 {
@@ -202,16 +203,8 @@ abstract class UnixBuilderBase extends BuilderBase
             $util = new SPCConfigUtil($this);
             $config = $util->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
             $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
-            $lens .= ' ' . getenv('SPC_LIBC_LINKAGE');
-            // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
-            if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
-                $ext_path = 'LD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$LD_LIBRARY_PATH ';
-                FileSystem::removeFileIfExists(BUILD_LIB_PATH . '/libphp.a');
-            } else {
-                $ext_path = '';
-                foreach (glob(BUILD_LIB_PATH . '/libphp*.so') as $file) {
-                    unlink($file);
-                }
+            if (SPCTarget::isStatic()) {
+                $lens .= ' -static';
             }
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult(getenv('CC') . ' -o embed embed.c ' . $lens);
             if ($ret !== 0) {
@@ -327,8 +320,7 @@ abstract class UnixBuilderBase extends BuilderBase
         $debugFlags = $this->getOption('no-strip') ? "'-w -s' " : '';
         $extLdFlags = "-extldflags '-pie'";
         $muslTags = '';
-        $staticFlags = '';
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl' && getenv('SPC_LIBC_LINKAGE') === 'static') {
+        if (SPCTarget::isStatic()) {
             $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000'";
             $muslTags = 'static_build,';
             $staticFlags = '-static -static-pie';

src/SPC/builder/unix/library/imagemagick.php

@@ -4,18 +4,19 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\builder\linux\library\LinuxLibraryBase;
-use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCTarget;
 
 trait imagemagick
 {
     /**
      * @throws RuntimeException
      * @throws FileSystemException
+     * @throws WrongUsageException
      */
     protected function build(): void
     {
@@ -37,11 +38,11 @@ trait imagemagick
                 '--without-x',
             );
 
-        // special: linux musl needs `-static`
-        $ldflags = ($this instanceof LinuxLibraryBase) && getenv('SPC_LIBC') !== 'glibc' ? ('-static -ldl') : '-ldl';
+        // special: linux-static target needs `-static`
+        $ldflags = SPCTarget::isStatic() ? ('-static -ldl') : '-ldl';
 
         // special: macOS needs -iconv
-        $libs = $this instanceof MacOSLibraryBase ? '-liconv' : '';
+        $libs = SPCTarget::getTargetOS() === 'Darwin' ? '-liconv' : '';
 
         $ac->appendEnv([
             'LDFLAGS' => $ldflags,

src/SPC/builder/unix/library/ldap.php

@@ -6,12 +6,13 @@ namespace SPC\builder\unix\library;
 
 use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCTarget;
 
 trait ldap
 {
     public function patchBeforeBuild(): bool
     {
-        $extra = getenv('SPC_LIBC') === 'glibc' ? '-ldl -lpthread -lm -lresolv -lutil' : '';
+        $extra = SPCTarget::getLibc() === 'glibc' ? '-ldl -lpthread -lm -lresolv -lutil' : '';
         FileSystem::replaceFileStr($this->source_dir . '/configure', '"-lssl -lcrypto', '"-lssl -lcrypto -lz ' . $extra);
         return true;
     }

src/SPC/builder/unix/library/libxslt.php

@@ -33,7 +33,13 @@ trait libxslt
                 '--without-debugger',
                 "--with-libxml-prefix={$this->getBuildRootPath()}",
             );
-        $ac->exec("{$this->builder->getOption('library_path')} {$this->builder->getOption('ld_library_path')} ./configure {$ac->getConfigureArgsString()}")->make();
+        if (getenv('SPC_LINUX_DEFAULT_LD_LIBRARY_PATH') && getenv('SPC_LINUX_DEFAULT_LIBRARY_PATH')) {
+            $ac->appendEnv([
+                'LD_LIBRARY_PATH' => getenv('SPC_LINUX_DEFAULT_LD_LIBRARY_PATH'),
+                'LIBRARY_PATH' => getenv('SPC_LINUX_DEFAULT_LIBRARY_PATH'),
+            ]);
+        }
+        $ac->configure()->make();
 
         $this->patchPkgconfPrefix(['libexslt.pc']);
         $this->patchLaDependencyPrefix();

src/SPC/builder/unix/library/mimalloc.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\util\executor\UnixCMakeExecutor;
+use SPC\util\SPCTarget;
 
 trait mimalloc
 {
@@ -13,9 +14,9 @@ trait mimalloc
         $cmake = UnixCMakeExecutor::create($this)
             ->addConfigureArgs(
                 '-DMI_BUILD_SHARED=OFF',
-                '-DMI_INSTALL_TOPLEVEL=ON'
+                '-DMI_INSTALL_TOPLEVEL=ON',
             );
-        if (getenv('SPC_LIBC') === 'musl') {
+        if (SPCTarget::getLibc() === 'musl') {
             $cmake->addConfigureArgs('-DMI_LIBC_MUSL=ON');
         }
         $cmake->build();

src/SPC/builder/unix/library/pkgconfig.php

@@ -4,17 +4,17 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCTarget;
 
 trait pkgconfig
 {
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)
-            ->appendEnv([
+            ->appendEnv([[
                 'CFLAGS' => '-Wimplicit-function-declaration -Wno-int-conversion',
-                'LDFLAGS' => !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? '' : '--static',
+                'LDFLAGS' => SPCTarget::isStatic() ? '--static' : '',
             ])
             ->configure(
                 '--with-internal-glib',

src/SPC/builder/unix/library/postgresql.php

@@ -8,6 +8,7 @@ use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
+use SPC\util\SPCTarget;
 
 trait postgresql
 {
@@ -50,7 +51,7 @@ trait postgresql
         $error_exec_cnt += $output[0] === 0 ? 0 : 1;
         if (!empty($output[1][0])) {
             $ldflags = $output[1][0];
-            $envs .= !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? " LDFLAGS=\"{$ldflags}\" " : " LDFLAGS=\"{$ldflags} -static\" ";
+            $envs .= SPCTarget::isStatic() ? " LDFLAGS=\"{$ldflags} -static\" " : " LDFLAGS=\"{$ldflags}\" ";
         }
         $output = shell()->execWithResult("pkg-config --libs-only-l --static {$packages}");
         $error_exec_cnt += $output[0] === 0 ? 0 : 1;

src/SPC/builder/windows/WindowsBuilder.php

@@ -34,6 +34,7 @@ class WindowsBuilder extends BuilderBase
         $this->options = $options;
 
         GlobalEnvManager::init();
+        GlobalEnvManager::afterInit();
 
         // ---------- set necessary options ----------
         // set sdk (require visual studio 16 or 17)