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

revert EXTRA_LDFLAGS_PROGRAM patch, TODO: patchBeforeMake and remove -lacl from the libtool command

Browse Source
This commit is contained in:
Marc Henderkes
2025-03-05 11:59:30 +01:00
parent 460699c48c
commit 4bc4c2ff05
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/SPC/builder/linux/LinuxBuilder.php
View File

@@ -287,14 +287,7 @@ class LinuxBuilder extends UnixBuilderBase
*/ */
protected function buildFpm(): void protected function buildFpm(): void
{ {
$vars = $this->getMakeExtraVars(); $vars = $this->getEnvString($this->getMakeExtraVars());
if ($this->getLib('libacl') !== null) {
$ldflags_program = $vars['EXTRA_LDFLAGS_PROGRAM'] ?? '';
if (!str_contains($ldflags_program, '-L' . BUILD_LIB_PATH)) {
$vars['EXTRA_LDFLAGS_PROGRAM'] = trim('-L' . BUILD_LIB_PATH . ' ' . $ldflags_program);
}
}
$vars = $this->getEnvString($vars);
shell()->cd(SOURCE_PATH . '/php-src') shell()->cd(SOURCE_PATH . '/php-src')
->exec('sed -i "s|//lib|/lib|g" Makefile') ->exec('sed -i "s|//lib|/lib|g" Makefile')
->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} fpm"); ->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} fpm");

1
src/SPC/builder/unix/library/attr.php
View File

@@ -21,6 +21,5 @@ trait attr
->exec('make install DESTDIR=' . BUILD_ROOT_PATH); ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
$this->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX); $this->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX);
$this->cleanLaFiles();
} }
} }

1
src/SPC/builder/unix/library/libacl.php
View File

@@ -25,6 +25,5 @@ trait libacl
->exec('make install DESTDIR=' . BUILD_ROOT_PATH); ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
$this->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX); $this->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX);
$this->cleanLaFiles();
} }
} }