crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-03 23:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(xlswriter): use -std=gnu17 to fix K&R declarations rejected by C23

Browse Source 
The bundled minizip in xlswriter has K&R C function declarations in
multiple files (mztools.c, ioapi.c). Apple Clang (Xcode 16+) defaults
to C23, which removed K&R from the standard, causing hard build errors.

Instead of patching individual files, downgrade the C standard to gnu17
for the whole build when xlswriter is enabled. This covers all K&R
occurrences in the bundled code.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Kévin Dunglas
2026-04-09 08:49:49 +02:00
parent 105f0328e6
commit 4d2036f20e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/SPC/builder/extension/xlswriter.php
View File

@@ -5,9 +5,9 @@ declare(strict_types=1);
namespace SPC\builder\extension;
use SPC\builder\Extension;
use SPC\store\FileSystem;
use SPC\store\SourcePatcher;
use SPC\util\CustomExt;
use SPC\util\GlobalEnvManager;
#[CustomExt('xlswriter')]
class xlswriter extends Extension
@@ -30,14 +30,9 @@ class xlswriter extends Extension
{
$patched = parent::patchBeforeMake();
// Fix K&R C function declaration in bundled minizip rejected by modern Clang (C23 default)
$mztools = $this->source_dir . '/library/libxlsxwriter/third_party/minizip/mztools.c';
if (file_exists($mztools)) {
FileSystem::replaceFileStr(
$mztools,
"extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)\nconst char* file;\nconst char* fileOut;\nconst char* fileOutTmp;\nuLong* nRecovered;\nuLong* bytesRecovered;\n{",
"extern int ZEXPORT unzRepair(const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered)\n{"
);
// Bundled minizip uses K&R C function declarations rejected by C23 (default on macOS with Xcode 16+)
if (PHP_OS_FAMILY !== 'Windows') {
GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
$patched = true;
}
@@ -53,4 +48,9 @@ class xlswriter extends Extension
}
return $patched;
}
protected function getExtraEnv(): array
{
return ['CFLAGS' => '-std=gnu17'];
}
}