From e2d294f8656a61fd82498f21a00008bd397b7d83 Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Thu, 4 Mar 2021 09:45:46 +0800 Subject: [PATCH] fix corosync compiling failed (cherry picked from commit ad78607de5a8dfe3d6411bfb087c15cdeb94cab1) --- fix-corosync-compile-fail.patch | 22 ++++++++++++++++++++++ libqb.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fix-corosync-compile-fail.patch diff --git a/fix-corosync-compile-fail.patch b/fix-corosync-compile-fail.patch new file mode 100644 index 0000000..ad64219 --- /dev/null +++ b/fix-corosync-compile-fail.patch @@ -0,0 +1,22 @@ +From bf461b565f24f2c913d913b3889ec7c47b115833 Mon Sep 17 00:00:00 2001 +From: Christine Caulfield +Date: Fri, 21 Feb 2020 07:53:23 +0000 +Subject: [PATCH] list: #include in qblist.h + +Some platforms require it. +--- + include/qb/qblist.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/qb/qblist.h b/include/qb/qblist.h +index 8064c874..160417e1 100644 +--- a/include/qb/qblist.h ++++ b/include/qb/qblist.h +@@ -28,6 +28,7 @@ extern "C" { + /* *INDENT-ON* */ + + #include ++#include + #include + + /** diff --git a/libqb.spec b/libqb.spec index 268d9d6..802e457 100644 --- a/libqb.spec +++ b/libqb.spec @@ -1,12 +1,13 @@ Name: libqb Version: 1.0.5 -Release: 1 +Release: 2 Summary: Library providing high performance logging, tracing, ipc, and poll License: LGPLv2+ URL: https://github.com/ClusterLabs/libqb Source0: https://github.com/ClusterLabs/libqb/releases/download/v%{version}/%{name}-%{version}.tar.xz Patch0: IPC-avoid-temporary-channel-priority-loss.patch Patch1: libqb-fix-list-handling-gcc10.patch +Patch2: fix-corosync-compile-fail.patch BuildRequires: autoconf automake libtool check-devel doxygen gcc procps pkgconfig(glib-2.0) BuildRequires: git-core %description @@ -63,6 +64,11 @@ help documents for libqb package %{_mandir}/man3/qb*3* %changelog +* Thu Mar 4 2021 baizhonggui - 1.0.5-2 +- new add #include in qblist.h to fix: + issue# https://gitee.com/src-openeuler/corosync/issues/I39X3F?from=project-issue + upstream link:https://github.com/ClusterLabs/libqb/pull/384 + * Thu Feb 25 2021 sunguoshuai - 1.0.5-1 - upgrade to 1.0.5 -- Gitee