CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

corosync: fix build error when package config rdma enabled

Browse Source 
Fix corosync build error when package config rdma enabled.

* replace dependency librdmacm from layer meta-cloud-services with
  rdma-core from meta-networking
* add patch to fix issue that fail to find rdma library via pkgconfig

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang 2019-12-13 10:13:42 +08:00 committed by Khem Raj
parent 69bc6ff2fb
commit 57bc531081
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch Normal file
View File

@ -0,0 +1,32 @@
Subject: [PATCH] configure.ac: fix pkgconfig issue of rdma
pkgconfig files from rdma-core(https://github.com/linux-rdma/rdma-core)
are named start with lib, such as librdmacm.pc and libibverbs.pc. When
rdma support is enabled, it fails to find rdma related libraries. Update
configure.ac to the issue.
Upstream-Status: Submitted [https://github.com/corosync/corosync/pull/515]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index ac513e93..240cfed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,8 +459,8 @@ if test "x${enable_testagents}" = xyes; then
fi
if test "x${enable_rdma}" = xyes; then
- PKG_CHECK_MODULES([rdmacm],[rdmacm])
- PKG_CHECK_MODULES([ibverbs],[ibverbs])
+ PKG_CHECK_MODULES([rdmacm],[librdmacm])
+ PKG_CHECK_MODULES([ibverbs],[libibverbs])
AC_DEFINE_UNQUOTED([HAVE_RDMA], 1, [have rdmacm])
PACKAGE_FEATURES="$PACKAGE_FEATURES rdma"
WITH_LIST="$WITH_LIST --with rdma"
--
2.20.1

3
meta-networking/recipes-extended/corosync/corosync_2.4.5.bb
View File

@ -9,6 +9,7 @@ inherit autotools pkgconfig systemd useradd
SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \
file://corosync.conf \
file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \
"
SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd"
@ -36,7 +37,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,librdmacm"
PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,rdma-core"
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"