[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, experimental, updated. debian/3.0.4-1-4-g944f6d0

[Guido Günther]

The following commit has been merged in the experimental branch:
commit b7d066abf22192aa69256b3eb59cb1c22d1c9402
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Nov 2 19:51:04 2009 +0100

    make sure we find liblogthread
    
    Fixes build without liblogthread installed.

diff --git a/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch b/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
new file mode 100644
index 0000000..7620a27
--- /dev/null
+++ b/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
@@ -0,0 +1,22 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 2 Nov 2009 19:44:09 +0100
+Subject: [PATCH] add LD_LIBRARY_PATH so we find liblogthread
+
+---
+ fence/agents/xvm/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
+index 6215263..31b277f 100644
+--- a/fence/agents/xvm/Makefile
++++ b/fence/agents/xvm/Makefile
+@@ -61,7 +61,7 @@ ${TARGET3}: ${OBJS3}
+ 
+ $(MANTARGET): $(TARGET1) ${SRCDIR}/fence/agents/lib/fence2man.xsl
+ 	set -e && \
+-	./$(TARGET1) -o metadata > .$@.tmp && \
++	LD_LIBRARY_PATH=${logtlibdir} ./$(TARGET1) -o metadata > .$@.tmp && \
+ 	xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@
+ 
+ clean: generalclean
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e2c0855..bcf3405 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-add-dlm-kernel-headers.patch
+0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch

-- 
cluster suite Debian packaging