From 6756fd0986f0236777f4ee043aff857256ee49cf Mon Sep 17 00:00:00 2001 From: Davide Frattarolo Date: Sun, 22 Sep 2024 21:32:28 +0200 Subject: [PATCH] Added optional zlib and disabled two extension asd --- config/lib.json | 5 ++--- src/SPC/builder/unix/library/librdkafka.php | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config/lib.json b/config/lib.json index 4df318dad..3c84b2bfb 100644 --- a/config/lib.json +++ b/config/lib.json @@ -427,9 +427,8 @@ "librdkafka++.a", "librdkafka-static.a" ], - "lib-depends": [ - "openssl", - "zlib" + "lib-suggests": [ + "zstd" ] }, "postgresql": { diff --git a/src/SPC/builder/unix/library/librdkafka.php b/src/SPC/builder/unix/library/librdkafka.php index 41f6ed32d..5ee4c0c8e 100644 --- a/src/SPC/builder/unix/library/librdkafka.php +++ b/src/SPC/builder/unix/library/librdkafka.php @@ -16,15 +16,19 @@ trait librdkafka protected function build(): void { $builddir = BUILD_ROOT_PATH; + + $zstd_option = $this->builder->getLib('zstd') ? ("STATIC_LIB_libzstd={$builddir}/lib/libzstd.a ") : ''; shell()->cd($this->source_dir) ->exec( + $zstd_option . './configure ' . - '--enable-static --disable-shared --disable-curl --disable-sasl --disable-valgrind ' . + '--enable-static --disable-shared --disable-curl --disable-sasl --disable-valgrind --disable-zlib --disable-ssl ' . + ($zstd_option == '' ? '--disable-zstd ' : '') . '--prefix=' ) ->exec('make clean') ->exec("make -j{$this->builder->concurrency}") - ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); + ->exec("make install DESTDIR={$builddir}"); $this->patchPkgconfPrefix(['rdkafka.pc', 'rdkafka-static.pc', 'rdkafka++.pc', 'rdkafka++-static.pc']); // remove dynamic libs shell()