mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-18 12:54:52 +08:00
don't fail build without ldap
This commit is contained in:
parent
c83e803c85
commit
8a1689b79d
@ -44,7 +44,7 @@ trait postgresql
|
|||||||
$error_exec_cnt = 0;
|
$error_exec_cnt = 0;
|
||||||
|
|
||||||
foreach ($optional_packages as $lib => $pkg) {
|
foreach ($optional_packages as $lib => $pkg) {
|
||||||
if ($this->getBuilder()->getLib($lib)) {
|
if ($this->builder->getLib($lib)) {
|
||||||
$packages .= ' ' . $pkg;
|
$packages .= ' ' . $pkg;
|
||||||
$output = shell()->execWithResult("pkg-config --static {$pkg}");
|
$output = shell()->execWithResult("pkg-config --static {$pkg}");
|
||||||
$error_exec_cnt += $output[0] === 0 ? 0 : 1;
|
$error_exec_cnt += $output[0] === 0 ? 0 : 1;
|
||||||
@ -125,10 +125,12 @@ trait postgresql
|
|||||||
'--without-tcl '
|
'--without-tcl '
|
||||||
);
|
);
|
||||||
|
|
||||||
$libs = PkgConfigUtil::getLibsArray('ldap');
|
if ($this->builder->getLib('ldap')) {
|
||||||
$libs = clean_spaces(implode(' ', $libs));
|
$libs = PkgConfigUtil::getLibsArray('ldap');
|
||||||
FileSystem::replaceFileStr($this->source_dir . '/build/config.status', '-lldap', $libs);
|
$libs = clean_spaces(implode(' ', $libs));
|
||||||
FileSystem::replaceFileStr($this->source_dir . '/build/src/Makefile.global', '-lldap', $libs);
|
FileSystem::replaceFileStr($this->source_dir . '/build/config.status', '-lldap', $libs);
|
||||||
|
FileSystem::replaceFileStr($this->source_dir . '/build/src/Makefile.global', '-lldap', $libs);
|
||||||
|
}
|
||||||
|
|
||||||
$shell
|
$shell
|
||||||
->exec($envs . ' make -C src/bin/pg_config install')
|
->exec($envs . ' make -C src/bin/pg_config install')
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user