MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 14:56:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

librdkafka: Use CMAKE_INSTALL_LIBDIR

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-03-19 21:41:22 -07:00
parent e3e020c1a3
commit 90c3d0c8ef
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch Normal file
View File

@ -0,0 +1,30 @@
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

4
meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
View File

@ -7,7 +7,9 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646"
SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master"
SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \
file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
"
SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996"
DEPENDS = "zlib openssl zstd"