Support suggested libs not specified by with-suggested-libs

This commit is contained in:
crazywhalecc 2025-11-04 13:51:11 +08:00
parent 6d1c6d7f61
commit 463a98b1bf
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
2 changed files with 3 additions and 1 deletions

View File

@ -31,12 +31,12 @@ trait librdkafka
->optionalLib('curl', ...cmake_boolean_args('WITH_CURL'))
->optionalLib('openssl', ...cmake_boolean_args('WITH_SSL'))
->optionalLib('zlib', ...cmake_boolean_args('WITH_ZLIB'))
->optionalLib('liblz4', ...cmake_boolean_args('ENABLE_LZ4_EXT'))
->addConfigureArgs(
'-DWITH_SASL=OFF',
'-DRDKAFKA_BUILD_STATIC=ON',
'-DRDKAFKA_BUILD_EXAMPLES=OFF',
'-DRDKAFKA_BUILD_TESTS=OFF',
'-DENABLE_LZ4_EXT=OFF',
)
->build();
}

View File

@ -146,8 +146,10 @@ class SPCConfigUtil
if (!is_array($extension)) {
$extension = [$extension];
}
$libs = array_map(fn ($y) => $y->getName(), array_merge(...array_map(fn ($x) => $x->getLibraryDependencies(true), $extension)));
return $this->config(
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_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
);