summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlper Ak <alperyasinak1@gmail.com>2025-07-09 20:30:35 +0300
committerKhem Raj <raj.khem@gmail.com>2025-07-09 13:35:17 -0700
commit1ca1493b71acc02e778138298dbc42d0f3e11fc6 (patch)
tree484565c881da42810b0d59b7e61694e3986ec93d
parent77a7925a84563a30d68a7acb022746f386b8b178 (diff)
downloadmeta-openembedded-1ca1493b71acc02e778138298dbc42d0f3e11fc6.tar.gz
librdkafka: Upgrade 1.8.2 -> 2.11.0 to allow CMake 4+ compatibility
- Dropped patch because fixed in the newer version. - The LICENSE file has changed so updated LIC_FILES_CHKSUM to match the new md5sum. - curl is needed as a dependency, so add it to prevent build error. Changelog: https://github.com/confluentinc/librdkafka/blob/v2.11.0/CHANGELOG.md Fix: | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | Compatibility with CMake < 3.5 has been removed from CMake. | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | to tell CMake that the project requires at least <min> but has been updated | to work with policies introduced by <max> or earlier. | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | | | -- Configuring incomplete, errors occurred! Signed-off-by: Alper Ak <alperyasinak1@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch30
-rw-r--r--meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb (renamed from meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb)11
2 files changed, 4 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
deleted file mode 100644
index 053a4cc2d8..0000000000
--- a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 19 Mar 2022 21:36:41 -0700
4Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
5
6this ensures that it is portable across platforms e.g. ppc64/linux
7uses lib64 not lib
8
9Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 CMakeLists.txt | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index d1129bce..774473fa 100644
17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt
19@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h")
20
21 include(GNUInstallDirs)
22
23-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
24+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
25
26 set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
27
28--
292.35.1
30
diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb
index 968094daff..b1f5196f93 100644
--- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
+++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.11.0.bb
@@ -5,18 +5,15 @@ HOMEPAGE = "https://github.com/edenhill/librdkafka"
5SECTION = "libs" 5SECTION = "libs"
6LICENSE = "BSD-2-Clause" 6LICENSE = "BSD-2-Clause"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=40b04809b5d6f648f20f45143cbcb1ad"
9 9
10SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ 10SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master"
11 file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ 11SRCREV = "c56a3e68483ae33622901988ab9c4085f0785c3c"
12 "
13SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
14 12
15DEPENDS = "zlib openssl zstd" 13DEPENDS = "zlib openssl zstd curl"
16 14
17inherit cmake 15inherit cmake
18 16
19
20FILES:${PN} += "${datadir}" 17FILES:${PN} += "${datadir}"
21 18
22EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" 19EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"