<

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;