diff options
-rw-r--r-- | meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 0000000000..d78ee7a8df --- /dev/null +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 51ec4c1f533dee9a499490c1c5bbd23d2191a4a7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 20 Mar 2022 11:14:25 -0700 | ||
4 | Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR | ||
5 | |||
6 | Do not hardcode library path, this helps it install in right location | ||
7 | independent of platforms, e.g. ppc64 uses lib64 and not lib | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/mfontanini/cppkafka/pull/291] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index c4e44e6..25ec1ce 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -51,7 +51,7 @@ option(CPPKAFKA_EXPORT_CMAKE_CONFIG "Generate CMake config, target and version f | ||
20 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") | ||
21 | |||
22 | if (NOT CPPKAFKA_CONFIG_DIR) | ||
23 | - set(CPPKAFKA_CONFIG_DIR lib/cmake/${PROJECT_NAME}) | ||
24 | + set(CPPKAFKA_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) | ||
25 | endif() | ||
26 | |||
27 | # Maintain previous compatibility | ||
28 | -- | ||
29 | 2.35.1 | ||
30 | |||
diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index 8f777eb182..0cb33fcd50 100644 --- a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb | |||
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ | 8 | file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ |
12 | file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ | ||
13 | " | ||
12 | SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" | 14 | SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" |
13 | 15 | ||
14 | DEPENDS = "librdkafka boost chrpath-replacement-native" | 16 | DEPENDS = "librdkafka boost chrpath-replacement-native" |