Skip to content

Commit f426ced

Browse files
committed
Use phpmicro patches instead
1 parent bab330b commit f426ced

File tree

4 files changed

+2
-129
lines changed

4 files changed

+2
-129
lines changed

config/env.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
6565
; upx executable path
6666
UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
6767
; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
68-
SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static
68+
SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static,win32_api
6969

7070
[linux]
7171
; Linux can use different build toolchains.

config/source.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@
762762
"micro": {
763763
"type": "git",
764764
"path": "php-src/sapi/micro",
765-
"rev": "php-85-win",
765+
"rev": "master",
766766
"url": "https://github.com/static-php/phpmicro",
767767
"license": {
768768
"type": "file",

src/SPC/store/SourcePatcher.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public static function init(): void
2323
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchPhpLibxml212']);
2424
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchGDWin32']);
2525
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
26-
FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchWin32Time']);
2726
FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
2827
FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
2928
FileSystem::addSourceExtractHook('yaml', [__CLASS__, 'patchYamlWin32']);
@@ -501,22 +500,6 @@ public static function patchFfiCentos7FixO3strncmp(): bool
501500
return true;
502501
}
503502

504-
public static function patchWin32Time(): bool
505-
{
506-
if (PHP_OS_FAMILY !== 'Windows') {
507-
return false;
508-
}
509-
if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
510-
return false;
511-
}
512-
$file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
513-
if (preg_match('/PHP_VERSION_ID (\d+)/', $file, $match) !== 0 && intval($match[1]) < 80400) {
514-
self::patchFile('php_win32_time.patch', SOURCE_PATH . '/php-src');
515-
return true;
516-
}
517-
return false;
518-
}
519-
520503
public static function patchPkgConfigForGcc15(): bool
521504
{
522505
self::patchFile('pkg-config_gcc15.patch', SOURCE_PATH . '/pkg-config');

src/globals/patch/php_win32_time.patch

Lines changed: 0 additions & 110 deletions
This file was deleted.

0 commit comments

Comments
 (0)