diff mbox series

[meta-oe] librdkafka: upgrade 1.8.2 -> 2.3.0

Message ID 20240103065145.170716-1-alperyasinak1@gmail.com
State Under Review
Headers show
Series [meta-oe] librdkafka: upgrade 1.8.2 -> 2.3.0 | expand

Commit Message

Alper Ak Jan. 3, 2024, 6:51 a.m. UTC
* License-Update: Copyright year changed
* 0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch dropped because fixed in the new version
* Fix -> WARNING: librdkafka-2.3.0-r0 do_package_qa: QA Issue: File /usr/lib/cmake/RdKafka/RdKafkaTargets.cmake in package librdkafka-dev contains reference to TMPDIR [buildpaths]

Changelog:

https://github.com/confluentinc/librdkafka/blob/v2.3.0/CHANGELOG.md

Signed-off-by: alperak <alperyasinak1@gmail.com>
---
 .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 -------------------
 ...ibrdkafka_1.8.2.bb => librdkafka_2.3.0.bb} | 21 +++++++------
 2 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
 rename meta-oe/recipes-support/librdkafka/{librdkafka_1.8.2.bb => librdkafka_2.3.0.bb} (59%)

Comments

Khem Raj Jan. 4, 2024, 7:14 p.m. UTC | #1
this is causing libcppkafta builds to fail

| DEBUG: Executing shell function do_compile
| NOTE: cmake --build
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/libcppkafka/0.4.0+git/build
--target all --
| ninja: error: '/usr/lib/libcurl.so', needed by
'src/lib/libcppkafka.so.0.4.0', missing and no known rule to make it

also see
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3484/steps/14/logs/stdio

On Tue, Jan 2, 2024 at 10:51 PM Alper Ak <alperyasinak1@gmail.com> wrote:
>
> * License-Update: Copyright year changed
> * 0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch dropped because fixed in the new version
> * Fix -> WARNING: librdkafka-2.3.0-r0 do_package_qa: QA Issue: File /usr/lib/cmake/RdKafka/RdKafkaTargets.cmake in package librdkafka-dev contains reference to TMPDIR [buildpaths]
>
> Changelog:
>
> https://github.com/confluentinc/librdkafka/blob/v2.3.0/CHANGELOG.md
>
> Signed-off-by: alperak <alperyasinak1@gmail.com>
> ---
>  .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 -------------------
>  ...ibrdkafka_1.8.2.bb => librdkafka_2.3.0.bb} | 21 +++++++------
>  2 files changed, 12 insertions(+), 39 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
>  rename meta-oe/recipes-support/librdkafka/{librdkafka_1.8.2.bb => librdkafka_2.3.0.bb} (59%)
>
> 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 053a4cc2d..000000000
> --- a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 19 Mar 2022 21:36:41 -0700
> -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
> -
> -this ensures that it is portable across platforms e.g. ppc64/linux
> -uses lib64 not lib
> -
> -Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - CMakeLists.txt | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index d1129bce..774473fa 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h")
> -
> - include(GNUInstallDirs)
> -
> --set(config_install_dir "lib/cmake/${PROJECT_NAME}")
> -+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
> -
> - set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
> -
> ---
> -2.35.1
> -
> diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> similarity index 59%
> rename from meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
> rename to meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> index 6148e7cb0..5b6e94d56 100644
> --- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
> +++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> @@ -5,19 +5,22 @@ 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=40b04809b5d6f648f20f45143cbcb1ad"
>
> -SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \
> -           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
> -          "
> -SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
> +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master"
> +SRCREV = "95a542c87c61d2c45b445f91c73dd5442eb04f3c"
>
> -DEPENDS = "zlib openssl zstd"
> -
> -inherit cmake
> +DEPENDS = "zlib curl zstd openssl"
>
>  S = "${WORKDIR}/git"
>
> -FILES:${PN} += "${datadir}"
> +inherit pkgconfig cmake
>
>  EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"
> +
> +do_install:append() {
> +       # remove absolute paths
> +       sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/RdKafka/RdKafkaTargets.cmake
> +}
> +
> +FILES:${PN} += "${datadir}"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108024): https://lists.openembedded.org/g/openembedded-devel/message/108024
> Mute This Topic: https://lists.openembedded.org/mt/103497939/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alper Ak Jan. 4, 2024, 8:16 p.m. UTC | #2
I was going to look but you already solved it. I tried with this commit you
just pushed
https://github.com/openembedded/meta-openembedded/commit/e36e872efc896ba4e380a0580ecaa69409f96485
and it seems to be solved. I guess I don't need to do anything, right? I
just need to understand what you did to learn :)

Khem Raj <raj.khem@gmail.com>, 4 Oca 2024 Per, 22:15 tarihinde şunu yazdı:

> this is causing libcppkafta builds to fail
>
> | DEBUG: Executing shell function do_compile
> | NOTE: cmake --build
>
> /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/libcppkafka/0.4.0+git/build
> --target all --
> | ninja: error: '/usr/lib/libcurl.so', needed by
> 'src/lib/libcppkafka.so.0.4.0', missing and no known rule to make it
>
> also see
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3484/steps/14/logs/stdio
>
> On Tue, Jan 2, 2024 at 10:51 PM Alper Ak <alperyasinak1@gmail.com> wrote:
> >
> > * License-Update: Copyright year changed
> > * 0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch dropped because fixed in the
> new version
> > * Fix -> WARNING: librdkafka-2.3.0-r0 do_package_qa: QA Issue: File
> /usr/lib/cmake/RdKafka/RdKafkaTargets.cmake in package librdkafka-dev
> contains reference to TMPDIR [buildpaths]
> >
> > Changelog:
> >
> > https://github.com/confluentinc/librdkafka/blob/v2.3.0/CHANGELOG.md
> >
> > Signed-off-by: alperak <alperyasinak1@gmail.com>
> > ---
> >  .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 -------------------
> >  ...ibrdkafka_1.8.2.bb => librdkafka_2.3.0.bb} | 21 +++++++------
> >  2 files changed, 12 insertions(+), 39 deletions(-)
> >  delete mode 100644
> meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
> >  rename meta-oe/recipes-support/librdkafka/{librdkafka_1.8.2.bb =>
> librdkafka_2.3.0.bb} (59%)
> >
> > 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 053a4cc2d..000000000
> > ---
> a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
> > +++ /dev/null
> > @@ -1,30 +0,0 @@
> > -From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Sat, 19 Mar 2022 21:36:41 -0700
> > -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
> > -
> > -this ensures that it is portable across platforms e.g. ppc64/linux
> > -uses lib64 not lib
> > -
> > -Upstream-Status: Submitted [
> https://github.com/edenhill/librdkafka/pull/3770]
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - CMakeLists.txt | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/CMakeLists.txt b/CMakeLists.txt
> > -index d1129bce..774473fa 100644
> > ---- a/CMakeLists.txt
> > -+++ b/CMakeLists.txt
> > -@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in"
> "${GENERATED_DIR}/config.h")
> > -
> > - include(GNUInstallDirs)
> > -
> > --set(config_install_dir "lib/cmake/${PROJECT_NAME}")
> > -+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
> > -
> > - set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
> > -
> > ---
> > -2.35.1
> > -
> > diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
> b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> > similarity index 59%
> > rename from meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
> > rename to meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> > index 6148e7cb0..5b6e94d56 100644
> > --- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
> > +++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
> > @@ -5,19 +5,22 @@ 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=40b04809b5d6f648f20f45143cbcb1ad"
> >
> > -SRC_URI = "git://
> github.com/edenhill/librdkafka;protocol=https;branch=master \
> > -           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
> > -          "
> > -SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
> > +SRC_URI = "git://
> github.com/edenhill/librdkafka;protocol=https;branch=master"
> > +SRCREV = "95a542c87c61d2c45b445f91c73dd5442eb04f3c"
> >
> > -DEPENDS = "zlib openssl zstd"
> > -
> > -inherit cmake
> > +DEPENDS = "zlib curl zstd openssl"
> >
> >  S = "${WORKDIR}/git"
> >
> > -FILES:${PN} += "${datadir}"
> > +inherit pkgconfig cmake
> >
> >  EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF
> -DRDKAFKA_BUILD_TESTS=OFF"
> > +
> > +do_install:append() {
> > +       # remove absolute paths
> > +       sed -i -e 's|${RECIPE_SYSROOT}||g'
> ${D}${libdir}/cmake/RdKafka/RdKafkaTargets.cmake
> > +}
> > +
> > +FILES:${PN} += "${datadir}"
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#108024):
> https://lists.openembedded.org/g/openembedded-devel/message/108024
> > Mute This Topic: https://lists.openembedded.org/mt/103497939/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Khem Raj Jan. 4, 2024, 8:48 p.m. UTC | #3
On Thu, Jan 4, 2024 at 12:16 PM Alper Ak <alperyasinak1@gmail.com> wrote:

> I was going to look but you already solved it. I tried with this commit
> you just pushed
> https://github.com/openembedded/meta-openembedded/commit/e36e872efc896ba4e380a0580ecaa69409f96485
> and it seems to be solved. I guess I don't need to do anything, right? I
> just need to understand what you did to learn :)
>

My patch does not solve the problem but in quest I did changes to
libcppkafka which I proposed regardless


> Khem Raj <raj.khem@gmail.com>, 4 Oca 2024 Per, 22:15 tarihinde şunu yazdı:
>
>> this is causing libcppkafta builds to fail
>>
>> | DEBUG: Executing shell function do_compile
>> | NOTE: cmake --build
>>
>> /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/libcppkafka/0.4.0+git/build
>> --target all --
>> | ninja: error: '/usr/lib/libcurl.so', needed by
>> 'src/lib/libcppkafka.so.0.4.0', missing and no known rule to make it
>>
>> also see
>>
>> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3484/steps/14/logs/stdio
>>
>> On Tue, Jan 2, 2024 at 10:51 PM Alper Ak <alperyasinak1@gmail.com> wrote:
>> >
>> > * License-Update: Copyright year changed
>> > * 0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch dropped because fixed in
>> the new version
>> > * Fix -> WARNING: librdkafka-2.3.0-r0 do_package_qa: QA Issue: File
>> /usr/lib/cmake/RdKafka/RdKafkaTargets.cmake in package librdkafka-dev
>> contains reference to TMPDIR [buildpaths]
>> >
>> > Changelog:
>> >
>> > https://github.com/confluentinc/librdkafka/blob/v2.3.0/CHANGELOG.md
>> >
>> > Signed-off-by: alperak <alperyasinak1@gmail.com>
>> > ---
>> >  .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 -------------------
>> >  ...ibrdkafka_1.8.2.bb => librdkafka_2.3.0.bb} | 21 +++++++------
>> >  2 files changed, 12 insertions(+), 39 deletions(-)
>> >  delete mode 100644
>> meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
>> >  rename meta-oe/recipes-support/librdkafka/{librdkafka_1.8.2.bb =>
>> librdkafka_2.3.0.bb} (59%)
>> >
>> > 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 053a4cc2d..000000000
>> > ---
>> a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
>> > +++ /dev/null
>> > @@ -1,30 +0,0 @@
>> > -From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001
>> > -From: Khem Raj <raj.khem@gmail.com>
>> > -Date: Sat, 19 Mar 2022 21:36:41 -0700
>> > -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
>> > -
>> > -this ensures that it is portable across platforms e.g. ppc64/linux
>> > -uses lib64 not lib
>> > -
>> > -Upstream-Status: Submitted [
>> https://github.com/edenhill/librdkafka/pull/3770]
>> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ----
>> > - CMakeLists.txt | 2 +-
>> > - 1 file changed, 1 insertion(+), 1 deletion(-)
>> > -
>> > -diff --git a/CMakeLists.txt b/CMakeLists.txt
>> > -index d1129bce..774473fa 100644
>> > ---- a/CMakeLists.txt
>> > -+++ b/CMakeLists.txt
>> > -@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in"
>> "${GENERATED_DIR}/config.h")
>> > -
>> > - include(GNUInstallDirs)
>> > -
>> > --set(config_install_dir "lib/cmake/${PROJECT_NAME}")
>> > -+set(config_install_dir
>> "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
>> > -
>> > - set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
>> > -
>> > ---
>> > -2.35.1
>> > -
>> > diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
>> b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
>> > similarity index 59%
>> > rename from meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
>> > rename to meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
>> > index 6148e7cb0..5b6e94d56 100644
>> > --- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
>> > +++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
>> > @@ -5,19 +5,22 @@ 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=40b04809b5d6f648f20f45143cbcb1ad"
>> >
>> > -SRC_URI = "git://
>> github.com/edenhill/librdkafka;protocol=https;branch=master \
>> > -           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
>> > -          "
>> > -SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
>> > +SRC_URI = "git://
>> github.com/edenhill/librdkafka;protocol=https;branch=master"
>> > +SRCREV = "95a542c87c61d2c45b445f91c73dd5442eb04f3c"
>> >
>> > -DEPENDS = "zlib openssl zstd"
>> > -
>> > -inherit cmake
>> > +DEPENDS = "zlib curl zstd openssl"
>> >
>> >  S = "${WORKDIR}/git"
>> >
>> > -FILES:${PN} += "${datadir}"
>> > +inherit pkgconfig cmake
>> >
>> >  EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF
>> -DRDKAFKA_BUILD_TESTS=OFF"
>> > +
>> > +do_install:append() {
>> > +       # remove absolute paths
>> > +       sed -i -e 's|${RECIPE_SYSROOT}||g'
>> ${D}${libdir}/cmake/RdKafka/RdKafkaTargets.cmake
>> > +}
>> > +
>> > +FILES:${PN} += "${datadir}"
>> > --
>> > 2.25.1
>> >
>> >
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> > Links: You receive all messages sent to this group.
>> > View/Reply Online (#108024):
>> https://lists.openembedded.org/g/openembedded-devel/message/108024
>> > Mute This Topic: https://lists.openembedded.org/mt/103497939/1997914
>> > Group Owner: openembedded-devel+owner@lists.openembedded.org
>> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
>> [raj.khem@gmail.com]
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> >
>>
>
diff mbox series

Patch

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 053a4cc2d..000000000
--- a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 19 Mar 2022 21:36:41 -0700
-Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
-
-this ensures that it is portable across platforms e.g. ppc64/linux
-uses lib64 not lib
-
-Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1129bce..774473fa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h")
- 
- include(GNUInstallDirs)
- 
--set(config_install_dir "lib/cmake/${PROJECT_NAME}")
-+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- 
- set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
- 
--- 
-2.35.1
-
diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
similarity index 59%
rename from meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
rename to meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
index 6148e7cb0..5b6e94d56 100644
--- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
+++ b/meta-oe/recipes-support/librdkafka/librdkafka_2.3.0.bb
@@ -5,19 +5,22 @@  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=40b04809b5d6f648f20f45143cbcb1ad"
 
-SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \
-           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
-          "
-SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
+SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master"
+SRCREV = "95a542c87c61d2c45b445f91c73dd5442eb04f3c"
 
-DEPENDS = "zlib openssl zstd"
-
-inherit cmake
+DEPENDS = "zlib curl zstd openssl"
 
 S = "${WORKDIR}/git"
 
-FILES:${PN} += "${datadir}"
+inherit pkgconfig cmake
 
 EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"
+
+do_install:append() {
+	# remove absolute paths
+	sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/RdKafka/RdKafkaTargets.cmake
+}
+
+FILES:${PN} += "${datadir}"