From 86d1cf00d662de60a319ce7ae3d7f0a2528aeae9 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Wed, 25 Aug 2021 09:32:54 -0500 Subject: [PATCH] Resolves: rhbz#1982216 --- 0001-stonith_helper-fix-build.patch | 39 +++++++++++++++++++++++++++++ dlm.spec | 7 ++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 0001-stonith_helper-fix-build.patch diff --git a/0001-stonith_helper-fix-build.patch b/0001-stonith_helper-fix-build.patch new file mode 100644 index 0000000..574fa29 --- /dev/null +++ b/0001-stonith_helper-fix-build.patch @@ -0,0 +1,39 @@ +From 5afd9fdc0ef202633f57abc063a5a2c6cef1d61d Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Wed, 28 Jul 2021 16:12:43 -0500 +Subject: [PATCH] stonith_helper: fix build + +include stdlib +use pkg-config to get pacemaker headers +--- + fence/Makefile | 1 + + fence/stonith_helper.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/fence/Makefile b/fence/Makefile +index b927879eb141..1f6dd6b2c40e 100644 +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -20,6 +20,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + CFLAGS += -fPIE -DPIE + CFLAGS += `xml2-config --cflags` + CFLAGS += -I../include ++CFLAGS += $(shell pkg-config --cflags pacemaker-fencing) + + LDFLAGS += -Wl,-z,relro -pie + LDFLAGS += `xml2-config --libs` +diff --git a/fence/stonith_helper.c b/fence/stonith_helper.c +index 3a0768af2830..b1db352ae04f 100644 +--- a/fence/stonith_helper.c ++++ b/fence/stonith_helper.c +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.7.5 + diff --git a/dlm.spec b/dlm.spec index fc7c806..b3202c8 100644 --- a/dlm.spec +++ b/dlm.spec @@ -15,7 +15,7 @@ BuildRequires: systemd-devel BuildRequires: make Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz -# Patch0: 0001-foo.patch +Patch0: 0001-stonith_helper-fix-build.patch %if 0%{?rhel} && 0%{?rhel} <= 7 ExclusiveArch: i686 x86_64 @@ -34,7 +34,7 @@ The kernel dlm requires a user daemon to control membership. %prep %setup -q -# %patch0 -p1 -b .0001-foo.patch +%patch0 -p1 -b .0001-stonith_helper-fix-build.patch %build # upstream does not require configure @@ -99,6 +99,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Wed Aug 25 2021 David Teigland - 4.0.9-7 +- fix pacemaker header + * Mon Aug 09 2021 Mohan Boddu - 4.0.9-6 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688