From be329c1d567ee0179f5a5206fb9b5062e5e74131 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 22 Jun 2026 11:14:14 +0800 Subject: [PATCH] feat(build): add patch to Makefile for include order to resolve zip.h conflict --- src/Package/Target/php/windows.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Package/Target/php/windows.php b/src/Package/Target/php/windows.php index 57a9e3ae..7697ce4b 100644 --- a/src/Package/Target/php/windows.php +++ b/src/Package/Target/php/windows.php @@ -95,6 +95,17 @@ trait windows cmd()->cd($package->getSourceDir())->exec(".\\configure.bat {$args} {$static_extension_str}"); } + #[BeforeStage('php', [self::class, 'makeCliForWindows'])] + #[PatchDescription('Patch Makefile to ensure buildroot/include comes before extension CFLAGS (fixes zip.h conflict with minizip)')] + public function patchMakefileIncludeOrder(TargetPackage $package): void + { + FileSystem::replaceFileStr( + "{$package->getSourceDir()}\\Makefile", + '$(CFLAGS_PHP_OBJ) $(CFLAGS)', + '$(CFLAGS) $(CFLAGS_PHP_OBJ)' + ); + } + #[BeforeStage('php', [self::class, 'makeCliForWindows'])] #[PatchDescription('Patch Windows Makefile for CLI target')] public function patchCLITarget(TargetPackage $package): void