fix building of shared extensions (grpc, simdjson, soap)

config/ext.json

@@ -759,11 +759,9 @@
  },
  "type": "builtin",
  "arg-type": "custom",
- "lib-depends": [
- "libxml2"
- ],
- "ext-depends-windows": [
- "xml"
+ "ext-depends": [
+ "libxml",
+ "session"
  ]
  },
  "sockets": {

config/lib.json

@@ -202,6 +202,7 @@
  "openssl",
  "libcares"
  ],
+ "cpp-library": true,
  "provide-pre-built": true,
  "frameworks": [
  "CoreFoundation"
@@ -230,6 +231,7 @@
  },
  "imagemagick": {
  "source": "imagemagick",
+ "cpp-library": true,
  "pkg-configs": [
  "Magick++-7.Q16HDRI",
  "MagickCore-7.Q16HDRI",
@@ -822,6 +824,7 @@
  },
  "snappy": {
  "source": "snappy",
+ "cpp-library": true,
  "static-libs-unix": [
  "libsnappy.a"
  ],
@@ -867,6 +870,7 @@
  },
  "watcher": {
  "source": "watcher",
+ "cpp-library": true,
  "static-libs-unix": [
  "libwatcher-c.a"
  ],

config/source.json

@@ -324,7 +324,7 @@
  },
  "grpc": {
  "type": "git",
- "rev": "v1.68.x",
+ "rev": "v1.75.x",
  "url": "https://github.com/grpc/grpc.git",
  "provide-pre-built": true,
  "license": {

src/SPC/builder/BuilderBase.php

@@ -128,27 +128,6 @@ public function getExts(bool $including_shared = true): array
  return array_filter($this->exts, fn ($ext) => $ext->isBuildStatic());
  }
 
- /**
- * Check if there is a cpp extensions or libraries.
- */
- public function hasCpp(): bool
- {
- // judge cpp-extension
- $exts = array_keys($this->getExts(false));
- foreach ($exts as $ext) {
- if (Config::getExt($ext, 'cpp-extension', false) === true) {
- return true;
- }
- }
- $libs = array_keys($this->getLibs());
- foreach ($libs as $lib) {
- if (Config::getLib($lib, 'cpp-library', false) === true) {
- return true;
- }
- }
- return false;
- }
-
  /**
  * Set libs only mode.
  *

src/SPC/builder/Extension.php

@@ -5,14 +5,11 @@
 namespace SPC\builder;
 
 use SPC\exception\EnvironmentException;
-use SPC\exception\FileSystemException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
-use SPC\toolchain\ClangNativeToolchain;
-use SPC\toolchain\GccNativeToolchain;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCConfigUtil;
@@ -226,12 +223,24 @@ public function patchBeforeSharedConfigure(): bool
  public function patchBeforeSharedMake(): bool
  {
  $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
- [$staticLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
- FileSystem::replaceFileRegex(
- $this->source_dir . '/Makefile',
- '/^(.*_SHARED_LIBADD\s*=.*)$/m',
- '$1 ' . trim($staticLibs)
- );
+ [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+ $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
+ $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
+
+ $makefileContent = file_get_contents($this->source_dir . '/Makefile');
+ if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
+ $prefix = $matches[1];
+ $currentLibs = trim($matches[2]);
+ $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
+ $deduplicatedLibs = deduplicate_flags($newLibs);
+
+ FileSystem::replaceFileRegex(
+ $this->source_dir . '/Makefile',
+ '/^(.*_SHARED_LIBADD\s*=.*)$/m',
+ $prefix . $deduplicatedLibs
+ );
+ }
+
  if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
  FileSystem::replaceFileRegex(
  $this->source_dir . '/Makefile',
@@ -405,42 +414,7 @@ public function buildShared(array $visited = []): void
  */
  public function buildUnixShared(): void
  {
- $config = (new SPCConfigUtil($this->builder))->config(
- [$this->getName()],
- array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
- $this->builder->getOption('with-suggested-exts'),
- $this->builder->getOption('with-suggested-libs'),
- );
- [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
- $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
- $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
- $env = [
- 'CFLAGS' => $config['cflags'],
- 'CXXFLAGS' => $config['cflags'],
- 'LDFLAGS' => $config['ldflags'],
- 'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
- 'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
- ];
- if (str_contains($env['LIBS'], '-lstdc++') && SPCTarget::getTargetOS() === 'Linux') {
- if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
- $env['SPC_COMPILER_EXTRA'] = '-lstdc++';
- } elseif (ToolchainManager::getToolchainClass() === GccNativeToolchain::class || ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
- try {
- $content = FileSystem::readFile($this->source_dir . '/config.m4');
- if ($content && !str_contains($content, 'PHP_ADD_LIBRARY(stdc++')) {
- $pattern = '/(PHP_NEW_EXTENSION\(' . $this->name . ',.*\))/m';
- $replacement = "$1\nPHP_ADD_LIBRARY(stdc++, 1, " . strtoupper($this->name) . '_SHARED_LIBADD)';
- FileSystem::replaceFileRegex(
- $this->source_dir . '/config.m4',
- $pattern,
- $replacement
- );
- }
- } catch (FileSystemException) {
- }
- }
- }
-
+ $env = $this->getSharedExtensionEnv();
  if ($this->patchBeforeSharedPhpize()) {
  logger()->info("Extension [{$this->getName()}] patched before shared phpize");
  }
@@ -455,13 +429,17 @@ public function buildUnixShared(): void
  logger()->info("Extension [{$this->getName()}] patched before shared configure");
  }
 
+ $has_avx512 = str_contains($this->builder->arch_c_flags ?? '', '-mavx512') ||
+ str_contains($this->arch_c_flags ?? '', '-march=x86-64-v4') ||
+ ToolchainManager::getToolchainClass() !== ZigToolchain::class;
+
  shell()->cd($this->source_dir)
  ->setEnv($env)
  ->appendEnv($this->getExtraEnv())
  ->exec(
  './configure ' . $this->getUnixConfigureArg(true) .
  ' --with-php-config=' . BUILD_BIN_PATH . '/php-config ' .
- '--enable-shared --disable-static'
+ '--enable-shared --disable-static' . (!$has_avx512 ? ' php_cv_have_avx512=no php_cv_have_avx512vbmi=no' : '')
  );
 
  if ($this->patchBeforeSharedMake()) {
@@ -512,6 +490,30 @@ public function isBuildStatic(): bool
  return $this->build_static;
  }
 
+ /**
+ * Returns the environment variables a shared extension needs to be built.
+ * CFLAGS, CXXFLAGS, LDFLAGS and so on.
+ */
+ protected function getSharedExtensionEnv(): array
+ {
+ $config = (new SPCConfigUtil($this->builder))->config(
+ [$this->getName()],
+ array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
+ $this->builder->getOption('with-suggested-exts'),
+ $this->builder->getOption('with-suggested-libs'),
+ );
+ [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+ $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
+ $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+ return [
+ 'CFLAGS' => $config['cflags'],
+ 'CXXFLAGS' => $config['cflags'],
+ 'LDFLAGS' => $config['ldflags'],
+ 'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
+ 'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
+ ];
+ }
+
  protected function addLibraryDependency(string $name, bool $optional = false): void
  {
  $depLib = $this->builder->getLib($name);
@@ -584,12 +586,12 @@ private function getLibraryDependencies(bool $recursive = false): array
  $added = 0;
  foreach ($ret as $depName => $dep) {
  foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
- if (!in_array($depdepName, array_keys($deps), true)) {
+ if (!array_key_exists($depdepName, $deps)) {
  $deps[$depdepName] = $depdep;
  ++$added;
  }
  }
- if (!in_array($depName, array_keys($deps), true)) {
+ if (!array_key_exists($depName, $deps)) {
  $deps[$depName] = $dep;
  }
  }

src/SPC/builder/extension/grpc.php

@@ -56,4 +56,11 @@ public function patchBeforeMake(): bool
  GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
  return true;
  }
+
+ protected function getSharedExtensionEnv(): array
+ {
+ $env = parent::getSharedExtensionEnv();
+ $env['CPPFLAGS'] = $env['CXXFLAGS'] . ' -Wno-attributes';
+ return $env;
+ }
 }

src/SPC/builder/extension/simdjson.php

@@ -6,6 +6,8 @@
 
 use SPC\builder\Extension;
 use SPC\store\FileSystem;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\CustomExt;
 
 #[CustomExt('simdjson')]
@@ -17,7 +19,7 @@ public function patchBeforeBuildconf(): bool
  FileSystem::replaceFileRegex(
  SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
  '/php_version=(`.*`)$/m',
- 'php_version=' . strval($php_ver)
+ 'php_version=' . $php_ver
  );
  FileSystem::replaceFileStr(
  SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
@@ -31,4 +33,18 @@ public function patchBeforeBuildconf(): bool
  );
  return true;
  }
+
+ public function getSharedExtensionEnv(): array
+ {
+ $env = parent::getSharedExtensionEnv();
+ if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+ $extra = getenv('SPC_COMPILER_EXTRA');
+ if (!str_contains((string) $extra, '-lstdc++')) {
+ f_putenv('SPC_COMPILER_EXTRA=' . clean_spaces($extra . ' -lstdc++'));
+ }
+ $env['CFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
+ $env['CXXFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
+ }
+ return $env;
+ }
 }

src/SPC/builder/linux/LinuxBuilder.php

@@ -9,6 +9,8 @@
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
@@ -103,6 +105,10 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
  );
  }
 
+ $has_avx512 = str_contains($this->arch_c_flags, '-mavx512') ||
+ str_contains($this->arch_c_flags, '-march=x86-64-v4') ||
+ ToolchainManager::getToolchainClass() !== ZigToolchain::class;
+
  $this->seekPhpSrcLogFileOnException(fn () => shell()->cd(SOURCE_PATH . '/php-src')->exec(
  $php_configure_env . ' ' .
  getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
@@ -116,6 +122,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
  $json_74 .
  $zts .
  $maxExecutionTimers .
+ (!$has_avx512 ? 'php_cv_have_avx512=no php_cv_have_avx512vbmi=no ' : '') .
  $this->makeStaticExtensionArgs() . ' '
  ));
 

src/SPC/builder/unix/UnixBuilderBase.php

@@ -291,19 +291,18 @@ protected function buildFrankenphp(): void
  }
  }
  $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
- $extLdFlags = "-extldflags '-pie{$dynamic_exports}'";
+ $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
  $muslTags = '';
  $staticFlags = '';
  if (SPCTarget::isStatic()) {
- $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports}'";
+ $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports} {$this->arch_ld_flags}'";
  $muslTags = 'static_build,';
  $staticFlags = '-static-pie';
  }
 
  $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
  $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
  $libs = $config['libs'];
- $libs .= PHP_OS_FAMILY === 'Linux' ? ' -lrt' : '';
  // Go's gcc driver doesn't automatically link against -lgcov or -lrt. Ugly, but necessary fix.
  if ((str_contains((string) getenv('SPC_DEFAULT_C_FLAGS'), '-fprofile') ||
  str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), '-fprofile')) &&

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

@@ -12,6 +12,11 @@ trait imagemagick
 {
  protected function build(): void
  {
+ $original_ldflags = $this->builder->arch_ld_flags;
+ if (str_contains($this->builder->arch_ld_flags, '-Wl,--as-needed')) {
+ $this->builder->arch_ld_flags = str_replace('-Wl,--as-needed', '', $original_ldflags);
+ }
+
  $ac = UnixAutoconfExecutor::create($this)
  ->optionalLib('libzip', ...ac_with_args('zip'))
  ->optionalLib('libjpeg', ...ac_with_args('jpeg'))
@@ -32,7 +37,7 @@ protected function build(): void
  );
 
  // special: linux-static target needs `-static`
- $ldflags = SPCTarget::isStatic() ? ('-static -ldl') : '-ldl';
+ $ldflags = SPCTarget::isStatic() ? '-static -ldl' : '-ldl';
 
  // special: macOS needs -iconv
  $libs = SPCTarget::getTargetOS() === 'Darwin' ? '-liconv' : '';
@@ -45,6 +50,8 @@ protected function build(): void
 
  $ac->configure()->make();
 
+ $this->builder->arch_ld_flags = $original_ldflags;
+
  $filelist = [
  'ImageMagick.pc',
  'ImageMagick-7.Q16HDRI.pc',

src/SPC/command/DownloadCommand.php

@@ -106,7 +106,7 @@ public function handle(): int
  }
 
  // retry
- $retry = intval($this->getOption('retry'));
+ $retry = (int) $this->getOption('retry');
  f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);
 
  // Use shallow-clone can reduce git resource download
@@ -265,7 +265,7 @@ private function downloadFromZip(string $path): int
  f_passthru((PHP_OS_FAMILY === 'Windows' ? 'rmdir /s /q ' : 'rm -rf ') . DOWNLOAD_PATH);
  }
  // unzip command check
- if (PHP_OS_FAMILY !== 'Windows' && !$this->findCommand('unzip')) {
+ if (PHP_OS_FAMILY !== 'Windows' && !self::findCommand('unzip')) {
  $this->output->writeln('Missing unzip command, you need to install it first !');
  $this->output->writeln('You can use "bin/spc doctor" command to check and install required tools');
  return static::FAILURE;