diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 2012ae3a..f12316ec 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -287,14 +287,7 @@ class LinuxBuilder extends UnixBuilderBase */ protected function buildFpm(): void { - $vars = $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); + $vars = $this->getEnvString($this->getMakeExtraVars()); shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') ->exec("\$SPC_CMD_PREFIX_PHP_MAKE {$vars} fpm"); diff --git a/src/SPC/builder/unix/library/attr.php b/src/SPC/builder/unix/library/attr.php index 66aa71c6..d82d12f6 100644 --- a/src/SPC/builder/unix/library/attr.php +++ b/src/SPC/builder/unix/library/attr.php @@ -21,6 +21,5 @@ trait attr ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX); - $this->cleanLaFiles(); } } diff --git a/src/SPC/builder/unix/library/libacl.php b/src/SPC/builder/unix/library/libacl.php index 9d6ebc82..27aa802b 100644 --- a/src/SPC/builder/unix/library/libacl.php +++ b/src/SPC/builder/unix/library/libacl.php @@ -25,6 +25,5 @@ trait libacl ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX); - $this->cleanLaFiles(); } }