mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-18 12:54:52 +08:00
Support suggested libs not specified by with-suggested-libs
This commit is contained in:
parent
6d1c6d7f61
commit
463a98b1bf
@ -31,12 +31,12 @@ trait librdkafka
|
|||||||
->optionalLib('curl', ...cmake_boolean_args('WITH_CURL'))
|
->optionalLib('curl', ...cmake_boolean_args('WITH_CURL'))
|
||||||
->optionalLib('openssl', ...cmake_boolean_args('WITH_SSL'))
|
->optionalLib('openssl', ...cmake_boolean_args('WITH_SSL'))
|
||||||
->optionalLib('zlib', ...cmake_boolean_args('WITH_ZLIB'))
|
->optionalLib('zlib', ...cmake_boolean_args('WITH_ZLIB'))
|
||||||
|
->optionalLib('liblz4', ...cmake_boolean_args('ENABLE_LZ4_EXT'))
|
||||||
->addConfigureArgs(
|
->addConfigureArgs(
|
||||||
'-DWITH_SASL=OFF',
|
'-DWITH_SASL=OFF',
|
||||||
'-DRDKAFKA_BUILD_STATIC=ON',
|
'-DRDKAFKA_BUILD_STATIC=ON',
|
||||||
'-DRDKAFKA_BUILD_EXAMPLES=OFF',
|
'-DRDKAFKA_BUILD_EXAMPLES=OFF',
|
||||||
'-DRDKAFKA_BUILD_TESTS=OFF',
|
'-DRDKAFKA_BUILD_TESTS=OFF',
|
||||||
'-DENABLE_LZ4_EXT=OFF',
|
|
||||||
)
|
)
|
||||||
->build();
|
->build();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -146,8 +146,10 @@ class SPCConfigUtil
|
|||||||
if (!is_array($extension)) {
|
if (!is_array($extension)) {
|
||||||
$extension = [$extension];
|
$extension = [$extension];
|
||||||
}
|
}
|
||||||
|
$libs = array_map(fn ($y) => $y->getName(), array_merge(...array_map(fn ($x) => $x->getLibraryDependencies(true), $extension)));
|
||||||
return $this->config(
|
return $this->config(
|
||||||
extensions: array_map(fn ($x) => $x->getName(), $extension),
|
extensions: array_map(fn ($x) => $x->getName(), $extension),
|
||||||
|
libraries: $libs,
|
||||||
include_suggest_ext: $include_suggest_ext ?: $this->builder?->getOption('with-suggested-exts') ?? false,
|
include_suggest_ext: $include_suggest_ext ?: $this->builder?->getOption('with-suggested-exts') ?? false,
|
||||||
include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
|
include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user