From e0c3323c928b0567669e49128e4946ef3a178d05 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 11 Dec 2021 17:53:21 +0100 Subject: librdkafka: update to 1.8.2 Dropped upstreamed patch. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../librdkafka/0001_fix_absolute_path_usage.patch | 83 ---------------------- .../recipes-support/librdkafka/librdkafka_1.6.1.bb | 23 ------ .../recipes-support/librdkafka/librdkafka_1.8.2.bb | 21 ++++++ 3 files changed, 21 insertions(+), 106 deletions(-) delete mode 100644 meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch delete mode 100644 meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb create mode 100644 meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb diff --git a/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch b/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch deleted file mode 100644 index d60978661d..0000000000 --- a/meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch +++ /dev/null @@ -1,83 +0,0 @@ -From dd06894a786edf4bea11dace50d7380b89dfaba5 Mon Sep 17 00:00:00 2001 -From: hasan.men -Date: Sun, 4 Apr 2021 17:20:32 +0200 -Subject: [PATCH] fix absolute path problem - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c6c05e06..e6c47374 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -176,7 +176,7 @@ if(MINGW) - endif(MINGW) - - # Support '#include ' --target_include_directories(rdkafka PUBLIC "$") -+target_include_directories(rdkafka PUBLIC $ $) - target_compile_definitions(rdkafka PUBLIC ${rdkafka_compile_definitions}) - if(RDKAFKA_BUILD_STATIC) - target_compile_definitions(rdkafka PUBLIC LIBRDKAFKA_STATICLIB) -@@ -188,7 +188,7 @@ if(MINGW) - target_link_libraries(rdkafka PUBLIC crypt32 ws2_32 secur32) - endif(MINGW) - --if(WIN32) -+if(WIN32) - if(RDKAFKA_BUILD_STATIC) - target_link_libraries(rdkafka PUBLIC crypt32) - else() -@@ -207,13 +207,13 @@ endif() - - if(WITH_ZLIB) - find_package(ZLIB REQUIRED) -- target_include_directories(rdkafka PUBLIC ${ZLIB_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${ZLIB_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB) - endif() - - if(WITH_ZSTD) -- target_link_libraries(rdkafka PUBLIC ${ZSTD_LIBRARY}) -- target_include_directories(rdkafka PUBLIC ${ZSTD_INCLUDE_DIR}) -+ target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY}) -+ target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR}) - message(STATUS "Found ZSTD: ${ZSTD_LIBRARY}") - endif() - -@@ -222,12 +222,12 @@ if(WITH_SSL) - if(NOT TARGET bundled-ssl) - message(FATAL_ERROR "bundled-ssl target not exist") - endif() -- target_include_directories(rdkafka BEFORE PUBLIC ${BUNDLED_SSL_INCLUDE_DIR}) -+ target_include_directories(rdkafka BEFORE PRIVATE ${BUNDLED_SSL_INCLUDE_DIR}) - target_link_libraries(rdkafka PUBLIC ${BUNDLED_SSL_LIBRARIES}) - add_dependencies(rdkafka bundled-ssl) - else() - find_package(OpenSSL REQUIRED) -- target_include_directories(rdkafka PUBLIC ${OPENSSL_INCLUDE_DIR}) -+ target_include_directories(rdkafka PRIVATE ${OPENSSL_INCLUDE_DIR}) - target_link_libraries(rdkafka PUBLIC OpenSSL::SSL OpenSSL::Crypto) - get_target_property(OPENSSL_TARGET_TYPE OpenSSL::SSL TYPE) - if(OPENSSL_CRYPTO_LIBRARY MATCHES "\\.a$") -@@ -244,7 +244,7 @@ find_package(Threads REQUIRED) - target_link_libraries(rdkafka PUBLIC Threads::Threads) - - if(WITH_SASL_CYRUS) -- target_include_directories(rdkafka PUBLIC ${SASL_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${SASL_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC ${SASL_LIBRARIES}) - endif() - -@@ -253,7 +253,7 @@ if(WITH_LIBDL) - endif() - - if(WITH_LZ4_EXT) -- target_include_directories(rdkafka PUBLIC ${LZ4_INCLUDE_DIRS}) -+ target_include_directories(rdkafka PRIVATE ${LZ4_INCLUDE_DIRS}) - target_link_libraries(rdkafka PUBLIC LZ4::LZ4) - endif() - --- -2.17.1 \ No newline at end of file diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb deleted file mode 100644 index ba235e9de1..0000000000 --- a/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "the Apache Kafka C/C++ client library" -DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, providing Producer, Consumer and Admin clients." -HOMEPAGE = "https://github.com/edenhill/librdkafka" -SECTION = "libs" -LICENSE = "BSD-2-Clause" - -LIC_FILES_CHKSUM = " \ -file://LICENSE;md5=2be8675acbfdac48935e73897af5f646 \ -" - -SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ - file://0001_fix_absolute_path_usage.patch" -SRCREV = "1a722553638bba85dbda5050455f7b9a5ef302de" - -DEPENDS = "zlib openssl zstd" - -inherit cmake - -S = "${WORKDIR}/git" - -FILES:${PN} += "${datadir}" - -EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" \ No newline at end of file diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb new file mode 100644 index 0000000000..f9f3baaf2c --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "the Apache Kafka C/C++ client library" +DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, \ + providing Producer, Consumer and Admin clients." +HOMEPAGE = "https://github.com/edenhill/librdkafka" +SECTION = "libs" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" + +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master" +SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" + +DEPENDS = "zlib openssl zstd" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES:${PN} += "${datadir}" + +EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" -- cgit v1.2.3-54-g00ecf