Fix dlm_stonith linking
This commit is contained in:
parent
810a2beec2
commit
33e57f096a
7
dlm.spec
7
dlm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: dlm
|
Name: dlm
|
||||||
Version: 3.99.1
|
Version: 3.99.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2 and GPLv2+ and LGPLv2+
|
License: GPLv2 and GPLv2+ and LGPLv2+
|
||||||
# For a breakdown of the licensing, see README.license
|
# For a breakdown of the licensing, see README.license
|
||||||
Group: System Environment/Kernel
|
Group: System Environment/Kernel
|
||||||
@ -12,6 +12,7 @@ BuildRequires: pacemaker-libs-devel >= 1.1.7
|
|||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
|
Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: dlm_stonith-link-with-ldl.patch
|
||||||
|
|
||||||
Requires: %{name}-lib = %{version}-%{release}
|
Requires: %{name}-lib = %{version}-%{release}
|
||||||
Requires: corosync >= 1.99.7
|
Requires: corosync >= 1.99.7
|
||||||
@ -25,6 +26,7 @@ The kernel dlm requires a user daemon to control cluster membership.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# upstream does not require configure
|
# upstream does not require configure
|
||||||
@ -101,6 +103,9 @@ developing applications that use %{name}.
|
|||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 21 2012 David Teigland <teigland@redhat.com> - 3.99.1-3
|
||||||
|
- Fix dlm_stonith linking
|
||||||
|
|
||||||
* Wed Mar 21 2012 David Teigland <teigland@redhat.com> - 3.99.1-2
|
* Wed Mar 21 2012 David Teigland <teigland@redhat.com> - 3.99.1-2
|
||||||
- Require pacemaker-libs-devel to build dlm_stonith
|
- Require pacemaker-libs-devel to build dlm_stonith
|
||||||
|
|
||||||
|
25
dlm_stonith-link-with-ldl.patch
Normal file
25
dlm_stonith-link-with-ldl.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 470688a483678f01341f45815d7376b9002d2ebb Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Teigland <teigland@redhat.com>
|
||||||
|
Date: Wed, 21 Mar 2012 16:09:01 -0500
|
||||||
|
Subject: [PATCH] dlm_stonith: link with -ldl
|
||||||
|
|
||||||
|
Signed-off-by: David Teigland <teigland@redhat.com>
|
||||||
|
---
|
||||||
|
fence/Makefile | 1 +
|
||||||
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/fence/Makefile b/fence/Makefile
|
||||||
|
index c6ff2c0..41af463 100644
|
||||||
|
--- a/fence/Makefile
|
||||||
|
+++ b/fence/Makefile
|
||||||
|
@@ -35,6 +35,7 @@ BIN_CFLAGS += -I../include
|
||||||
|
|
||||||
|
BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
|
||||||
|
BIN_LDFLAGS += `xml2-config --libs`
|
||||||
|
+BIN_LDFLAGS += -ldl
|
||||||
|
|
||||||
|
all: $(BIN_TARGET)
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.6.5
|
||||||
|
|
Loading…
Reference in New Issue
Block a user