Skip to content

Commit ff95b46

Browse files
committed
really stupid patch for swoole
1 parent 69e1acd commit ff95b46

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/SPC/builder/extension/swoole.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@
77
use SPC\builder\Extension;
88
use SPC\builder\macos\MacOSBuilder;
99
use SPC\store\FileSystem;
10+
use SPC\store\SourcePatcher;
1011
use SPC\util\CustomExt;
1112

1213
#[CustomExt('swoole')]
1314
class swoole extends Extension
1415
{
1516
public function patchBeforeMake(): bool
1617
{
18+
$patched = false;
19+
if (PHP_OS_FAMILY === 'Linux') {
20+
SourcePatcher::patchFile('swoole_fix_date_time.patch', $this->source_dir);
21+
$patched = true;
22+
}
1723
if ($this->builder instanceof MacOSBuilder) {
1824
// Fix swoole with event extension <util.h> conflict bug
1925
$util_path = shell()->execWithResult('xcrun --show-sdk-path', false)[1][0] . '/usr/include/util.h';
2026
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/swoole/thirdparty/php/standard/proc_open.cc', 'include <util.h>', 'include "' . $util_path . '"');
21-
return true;
27+
$patched = true;
2228
}
23-
return false;
29+
return $patched;
2430
}
2531

2632
public function getExtVersion(): ?string
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/config.m4
2+
+++ b/config.m4
3+
@@ -425,6 +425,7 @@
4+
AX_CHECK_COMPILE_FLAG(-Wloop-analysis, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wloop-analysis")
5+
AX_CHECK_COMPILE_FLAG(-Wuninitialized, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wuninitialized")
6+
AX_CHECK_COMPILE_FLAG(-Wno-missing-field-initializers, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-missing-field-initializers")
7+
+ AX_CHECK_COMPILE_FLAG(-Wno-date-time, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-date-time")
8+
AX_CHECK_COMPILE_FLAG(-Wno-sign-compare, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-sign-compare")
9+
AX_CHECK_COMPILE_FLAG(-Wno-unused-const-variable, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-unused-const-variable")
10+
AX_CHECK_COMPILE_FLAG(-Wno-unused-parameter, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-unused-parameter")

0 commit comments

Comments
 (0)