aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2021-12-11 17:53:21 +0100
committerKhem Raj <raj.khem@gmail.com>2021-12-13 08:09:25 -0800
commite0c3323c928b0567669e49128e4946ef3a178d05 (patch)
tree244f250c8e965fae9d5f5ede4531455e9a49bc5a /meta-oe/recipes-support
parenta168765249733c7a751fc28876c6090e3e257271 (diff)
downloadmeta-openembedded-contrib-e0c3323c928b0567669e49128e4946ef3a178d05.tar.gz
librdkafka: update to 1.8.2
Dropped upstreamed patch. Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/librdkafka/librdkafka/0001_fix_absolute_path_usage.patch83
-rw-r--r--meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb (renamed from meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb)14
2 files changed, 6 insertions, 91 deletions
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 d60978661d3..00000000000
--- 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 <hasan.men@bosphorusiss.com>
-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 <rdkafka.h>'
--target_include_directories(rdkafka PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>")
-+target_include_directories(rdkafka PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- 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.8.2.bb
index ba235e9de19..f9f3baaf2c3 100644
--- a/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb
+++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
@@ -1,16 +1,14 @@
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."
+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 \
-"
+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"
+SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master"
+SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
DEPENDS = "zlib openssl zstd"
@@ -20,4 +18,4 @@ S = "${WORKDIR}/git"
FILES:${PN} += "${datadir}"
-EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" \ No newline at end of file
+EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"