Merge branch 'refs/heads/main' into sapi/cgi-win

# Conflicts:
#	src/globals/test-extensions.php

src/SPC/builder/extension/gettext.php

@@ -15,7 +15,11 @@ class gettext extends Extension
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder instanceof MacOSBuilder) {
-            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gettext/config.m4', 'AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB(intl');
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/ext/gettext/config.m4',
+                ['AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB([$GETTEXT_CHECK_IN_LIB'],
+                ['AC_CHECK_LIB(intl', 'AC_CHECK_LIB([intl'] // new php versions use a bracket
+            );
         }
         return true;
     }

src/SPC/builder/extension/swoole.php

@@ -69,12 +69,15 @@ class swoole extends Extension
         $arg .= $this->builder->getExt('swoole-hook-pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
         $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
         $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
-
         if ($this->builder->getExt('swoole-hook-odbc')) {
             $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
             $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
         }
 
+        if ($this->getExtVersion() >= '6.1.0') {
+            $arg .= ' --enable-swoole-stdext';
+        }
+
         if (SPCTarget::getTargetOS() === 'Darwin') {
             $arg .= ' ac_cv_lib_pthread_pthread_barrier_init=no';
         }

src/SPC/builder/linux/LinuxBuilder.php

@@ -7,6 +7,7 @@ namespace SPC\builder\linux;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\PatchException;
 use SPC\exception\WrongUsageException;
+use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\GlobalEnvManager;
@@ -283,12 +284,17 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
+        $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
+        $sharedExts = array_filter($sharedExts, static function ($ext) {
+            return Config::getExt($ext->getName(), 'build-with-php') === true;
+        });
+        $install_modules = $sharedExts ? 'install-modules' : '';
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec('sed -i "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi install-build install-headers install-programs");
+            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
 
         $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
         $libDir = BUILD_LIB_PATH;

src/SPC/builder/macos/MacOSBuilder.php

@@ -7,6 +7,7 @@ namespace SPC\builder\macos;
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\WrongUsageException;
+use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\GlobalEnvManager;
@@ -264,10 +265,15 @@ class MacOSBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
+        $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
+        $sharedExts = array_filter($sharedExts, static function ($ext) {
+            return Config::getExt($ext->getName(), 'build-with-php') === true;
+        });
+        $install_modules = $sharedExts ? 'install-modules' : '';
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         shell()->cd(SOURCE_PATH . '/php-src')
-            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi install-build install-headers install-programs");
+            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
 
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
             $AR = getenv('AR') ?: 'ar';

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

@@ -17,7 +17,7 @@ trait attr
             ->exec('libtoolize --force --copy')
             ->exec('./autogen.sh || autoreconf -if')
             ->configure('--disable-nls')
-            ->make();
+            ->make('install-attributes_h install-data install-libattr_h install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfDATA', with_install: false);
         $this->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX);
     }
 }

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

@@ -31,7 +31,7 @@ trait gettext
             $autoconf->addConfigureArgs('--disable-threads');
         }
 
-        $autoconf->configure()->make();
+        $autoconf->configure()->make(dir: $this->getSourceDir() . '/gettext-runtime/intl');
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -26,7 +26,7 @@ trait libacl
             ->exec('libtoolize --force --copy')
             ->exec('./autogen.sh || autoreconf -if')
             ->configure('--disable-nls', '--disable-tests')
-            ->make();
+            ->make('install-acl_h install-libacl_h install-data install-libLTLIBRARIES install-pkgincludeHEADERS install-sysincludeHEADERS install-pkgconfDATA', with_install: false);
         $this->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX);
     }
 }

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

@@ -4,10 +4,21 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait libedit
 {
+    public function patchBeforeBuild(): bool
+    {
+        FileSystem::replaceFileRegex(
+            $this->source_dir . '/src/sys.h',
+            '|//#define\s+strl|',
+            '#define strl'
+        );
+        return true;
+    }
+
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)

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

@@ -10,7 +10,13 @@ trait libiconv
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->configure('--enable-extra-encodings')->make();
+        UnixAutoconfExecutor::create($this)
+            ->configure(
+                '--enable-extra-encodings',
+                '--enable-year2038',
+            )
+            ->make('install-lib', with_install: false)
+            ->make('install-lib', with_install: false, dir: $this->getSourceDir() . '/libcharset');
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -22,6 +22,7 @@ trait libzip
                 '-DBUILD_EXAMPLES=OFF',
                 '-DBUILD_REGRESS=OFF',
                 '-DBUILD_TOOLS=OFF',
+                '-DBUILD_OSSFUZZ=OFF',
             )
             ->build();
         $this->patchPkgconfPrefix(['libzip.pc'], PKGCONF_PATCH_PREFIX);