try fixing broken libsystemd
This commit is contained in:
parent
0e6d2d85f3
commit
482579474a
28
0001-dlm_controld-libsystemd-broke-itself.patch
Normal file
28
0001-dlm_controld-libsystemd-broke-itself.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 2eefc91150a3292c2be82f4139207e06b4c4bba4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Teigland <teigland@redhat.com>
|
||||||
|
Date: Fri, 10 Jun 2016 13:13:48 -0500
|
||||||
|
Subject: [PATCH] dlm_controld: libsystemd broke itself
|
||||||
|
|
||||||
|
---
|
||||||
|
dlm_controld/Makefile | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
|
||||||
|
index 13d6339ab263..cf556c9d72b8 100644
|
||||||
|
--- a/dlm_controld/Makefile
|
||||||
|
+++ b/dlm_controld/Makefile
|
||||||
|
@@ -62,9 +62,9 @@ LIB_CFLAGS += $(BIN_CFLAGS)
|
||||||
|
LIB_LDFLAGS += -Wl,-z,relro -pie
|
||||||
|
|
||||||
|
ifeq ($(USE_SD_NOTIFY),yes)
|
||||||
|
- BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
|
||||||
|
+ BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \
|
||||||
|
-DUSE_SD_NOTIFY
|
||||||
|
- BIN_LDFLAGS += $(shell pkg-config --libs libsystemd-daemon)
|
||||||
|
+ BIN_LDFLAGS += $(shell pkg-config --libs libsystemd)
|
||||||
|
endif
|
||||||
|
|
||||||
|
all: $(LIB_TARGET) $(BIN_TARGET)
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
9
dlm.spec
9
dlm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: dlm
|
Name: dlm
|
||||||
Version: 4.0.6
|
Version: 4.0.6
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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
|
||||||
@ -14,7 +14,7 @@ BuildRequires: systemd-units
|
|||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
|
Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
#Patch0: 0001-foo.patch
|
Patch0: 0001-dlm_controld-libsystemd-broke-itself.patch
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
ExclusiveArch: i686 x86_64
|
ExclusiveArch: i686 x86_64
|
||||||
@ -33,7 +33,7 @@ The kernel dlm requires a user daemon to control membership.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
#%patch0 -p1 -b .0001-foo.patch
|
%patch0 -p1 -b .0001-dlm_controld-libsystemd-broke-itself.patch
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# upstream does not require configure
|
# upstream does not require configure
|
||||||
@ -105,6 +105,9 @@ developing applications that use %{name}.
|
|||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 10 2016 David Teigland <teigland@redhat.com> - 4.0.6-2
|
||||||
|
- try fixing broken libsystemd
|
||||||
|
|
||||||
* Fri Jun 10 2016 David Teigland <teigland@redhat.com> - 4.0.6-1
|
* Fri Jun 10 2016 David Teigland <teigland@redhat.com> - 4.0.6-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user