From bdfd3eb269764490733e82b69ec2051b428aee3e Mon Sep 17 00:00:00 2001 From: henderkes Date: Sun, 24 May 2026 20:41:18 +0700 Subject: [PATCH] also revert #1122 --- src/Package/Extension/xlswriter.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/Package/Extension/xlswriter.php b/src/Package/Extension/xlswriter.php index f4d15530..f4202376 100644 --- a/src/Package/Extension/xlswriter.php +++ b/src/Package/Extension/xlswriter.php @@ -11,7 +11,6 @@ use StaticPHP\Attribute\Package\Extension; use StaticPHP\Attribute\PatchDescription; use StaticPHP\Package\PackageInstaller; use StaticPHP\Package\PhpExtensionPackage; -use StaticPHP\Util\GlobalEnvManager; use StaticPHP\Util\SourcePatcher; #[Extension('xlswriter')] @@ -21,20 +20,14 @@ class xlswriter extends PhpExtensionPackage #[CustomPhpConfigureArg('Linux')] public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string { - $arg = '--with-xlswriter --enable-reader'; + $shared = $shared ? '=shared' : ''; + $arg = "--with-xlswriter{$shared} --enable-reader"; if ($installer->getLibraryPackage('openssl')) { $arg .= ' --with-openssl=' . $installer->getLibraryPackage('openssl')->getBuildRootPath(); } return $arg; } - #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-xlswriter')] - #[PatchDescription('Fix Unix build: add -std=gnu17 to CFLAGS to fix build errors on older GCC versions')] - public function patchBeforeUnixMake(): void - { - GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17'); - } - #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-xlswriter')] #[PatchDescription('Fix Windows build: apply win32 patch and add UTF-8 BOM to theme.c')] public function patchBeforeMakeForWindows(): void @@ -47,11 +40,4 @@ class xlswriter extends PhpExtensionPackage file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content); } } - - public function getSharedExtensionEnv(): array - { - $parent = parent::getSharedExtensionEnv(); - $parent['CFLAGS'] .= ' -std=gnu17'; - return $parent; - } }