File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed
Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -400,7 +400,7 @@ public function buildUnixShared(): void
400400 ->exec (BUILD_BIN_PATH . '/phpize ' );
401401
402402 if ($ this ->patchBeforeSharedConfigure ()) {
403- logger ()->info ('ext [ . ' . $ this ->getName () . '] patching before shared configure ' );
403+ logger ()->info ('ext [ ' . $ this ->getName () . '] patching before shared configure ' );
404404 }
405405
406406 shell ()->cd ($ this ->source_dir )
@@ -419,7 +419,7 @@ public function buildUnixShared(): void
419419 );
420420
421421 if ($ this ->patchBeforeSharedMake ()) {
422- logger ()->info ('ext [ . ' . $ this ->getName () . '] patching before shared make ' );
422+ logger ()->info ('ext [ ' . $ this ->getName () . '] patching before shared make ' );
423423 }
424424
425425 shell ()->cd ($ this ->source_dir )
Original file line number Diff line number Diff line change @@ -21,10 +21,10 @@ public function validate(): void
2121
2222 public function patchBeforeSharedMake (): bool
2323 {
24- if (PHP_OS_FAMILY !== 'Linux ' || php_uname ( ' m ' ) !== 'aarch64 ' || SystemUtil:: getLibcVersionIfExists () > ' 2.17 ' ) {
24+ if (PHP_OS_FAMILY !== 'Linux ' || GNU_ARCH !== 'aarch64 ' ) {
2525 return false ;
2626 }
27- FileSystem::replaceFileRegex ($ this ->source_dir . '/Makefile ' , '/^(LDFLAGS =.*)$/ ' , '$1 -luv -ldl -lrt -pthread ' );
27+ FileSystem::replaceFileRegex ($ this ->source_dir . '/Makefile ' , '/^(LDFLAGS =.*)$/m ' , '$1 -luv -ldl -lrt -pthread ' );
2828 return true ;
2929 }
3030}
Original file line number Diff line number Diff line change @@ -61,8 +61,7 @@ public function checkCliTools(): ?CheckResult
6161
6262 $ required = match ($ distro ['dist ' ]) {
6363 'alpine ' => self ::TOOLS_ALPINE ,
64- 'redhat ' => self ::TOOLS_RHEL ,
65- 'centos ' => array_merge (self ::TOOLS_RHEL , ['perl-IPC-Cmd ' ]),
64+ 'redhat ' , 'centos ' => self ::TOOLS_RHEL ,
6665 'arch ' => self ::TOOLS_ARCH ,
6766 default => self ::TOOLS_DEBIAN ,
6867 };
You can’t perform that action at this time.
0 commit comments