mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
libcppkafka: Update to tip of trunk
Fix the PV to point to last release + git as 0.4.0 is unreleased yet Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-30
@@ -1,30 +0,0 @@
|
|||||||
From 51ec4c1f533dee9a499490c1c5bbd23d2191a4a7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 20 Mar 2022 11:14:25 -0700
|
|
||||||
Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
|
|
||||||
|
|
||||||
Do not hardcode library path, this helps it install in right location
|
|
||||||
independent of platforms, e.g. ppc64 uses lib64 and not lib
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/mfontanini/cppkafka/pull/291]
|
|
||||||
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 c4e44e6..25ec1ce 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -51,7 +51,7 @@ option(CPPKAFKA_EXPORT_CMAKE_CONFIG "Generate CMake config, target and version f
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
|
|
||||||
|
|
||||||
if (NOT CPPKAFKA_CONFIG_DIR)
|
|
||||||
- set(CPPKAFKA_CONFIG_DIR lib/cmake/${PROJECT_NAME})
|
|
||||||
+ set(CPPKAFKA_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Maintain previous compatibility
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@@ -9,17 +9,21 @@ file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \
|
|||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \
|
SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \
|
||||||
file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
|
|
||||||
"
|
"
|
||||||
SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733"
|
SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab"
|
||||||
|
|
||||||
DEPENDS = "librdkafka boost chrpath-replacement-native"
|
BASEPV = "0.4.0"
|
||||||
|
PV = "${BASEPV}+git"
|
||||||
|
|
||||||
|
DEPENDS = "librdkafka curl boost chrpath-replacement-native"
|
||||||
|
|
||||||
inherit cmake
|
inherit cmake
|
||||||
|
|
||||||
|
EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
do_install:append(){
|
do_install:append(){
|
||||||
chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1
|
chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV}
|
||||||
sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc
|
sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user