From e0228ab3992a3120b05f483db907de4312e378e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Feb 2010 15:44:29 +0000 Subject: [PATCH] Add a patch to link tests explicitly with -ldl (RHBZ#565096). --- vhostmd-0.4-link-with-dl.patch | 21 +++++++++++++++++++++ vhostmd.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 vhostmd-0.4-link-with-dl.patch diff --git a/vhostmd-0.4-link-with-dl.patch b/vhostmd-0.4-link-with-dl.patch new file mode 100644 index 0000000..dc478d2 --- /dev/null +++ b/vhostmd-0.4-link-with-dl.patch @@ -0,0 +1,21 @@ +diff -ur vhostmd-0.4.orig/test/Makefile.am vhostmd-0.4.dso/test/Makefile.am +--- vhostmd-0.4.orig/test/Makefile.am 2009-10-13 11:17:39.000000000 +0100 ++++ vhostmd-0.4.dso/test/Makefile.am 2010-02-16 15:42:10.102603034 +0000 +@@ -5,7 +5,7 @@ + noinst_PROGRAMS = test_static test_dyn + + test_static_SOURCES = main.c +-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) ++test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -ldl + if WITH_XENSTORE + test_static_LDADD += -lxenstore + endif +@@ -16,7 +16,7 @@ + + test_dyn_SOURCES = main.c + test_dyn_CFLAGS = -DUSE_DL_OPEN +-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) ++test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -ldl + if WITH_XENSTORE + test_dyn_LDADD += -lxenstore + endif diff --git a/vhostmd.spec b/vhostmd.spec index d67c77f..8f93f22 100644 --- a/vhostmd.spec +++ b/vhostmd.spec @@ -8,7 +8,7 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -22,6 +22,9 @@ Source1: vhostmd.init Source2: vhostmd.sysconfig Source3: vhostmd.conf +# RHBZ#565096. +Patch0: vhostmd-0.4-link-with-dl.patch + BuildRequires: chrpath BuildRequires: pkgconfig BuildRequires: libxml2-devel @@ -183,6 +186,9 @@ exit 0 %changelog +* Tue Feb 16 2010 Richard W.M. Jones - 0.4-3 +- Add a patch to link tests explicitly with -ldl (RHBZ#565096). + * Thu Dec 10 2009 Richard W.M. Jones - 0.4-2 - Fix the PagedOutMemory and PagedInMemory stats to report MB instead of pages (fixes supplied by Joachim Schneider).