[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.2-4

[Guido Günther]

The following commit has been merged in the master branch:
commit 398a4ddbe49eccf16b701ac15cab9e103a3421f0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jun 13 19:07:41 2011 +0200

    New patch Split-out-dlopen-detection.patch
    
    Explicitly pass -ldl since the lock manager needs it.

diff --git a/debian/patches/Split-out-dlopen-detection.patch b/debian/patches/Split-out-dlopen-detection.patch
new file mode 100644
index 0000000..0bcbe42
--- /dev/null
+++ b/debian/patches/Split-out-dlopen-detection.patch
@@ -0,0 +1,111 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 13 Jun 2011 14:21:31 +0200
+Subject: Split out dlopen detection
+
+since it's needed for the lock manager too. Fixes linking on non intel
+architectures.
+---
+ configure.ac    |   44 ++++++++++++++++++++++++++------------------
+ src/Makefile.am |    2 ++
+ 2 files changed, 28 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5307a1d..6d36f4d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2130,6 +2130,28 @@ esac
+ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
+ 
+ 
++# Check for dlopen needed for the locking manager and driver-modules
++DLOPEN_CFLAGS=
++DLOPEN_LIBS=
++old_cflags="$CFLAGS"
++old_libs="$LIBS"
++have_dlopen="yes"
++AC_CHECK_HEADER([dlfcn.h],[],[have_dlopen="no"])
++AC_SEARCH_LIBS([dlopen], [dl], [], [have_dlopen="no"])
++CFLAGS="$old_cflags"
++LIBS="$old_libs"
++
++if test "$have_dlopen" != "no"; then
++  case $ac_cv_search_dlopen in
++    no*) DLOPEN_LIBS= ;;
++    *) DLOPEN_LIBS=$ac_cv_search_dlopen ;;
++  esac
++fi
++AM_CONDITIONAL([HAVE_DLOPEN], [test "$have_dlopen" != "no"])
++AC_SUBST([DLOPEN_CFLAGS])
++AC_SUBST([DLOPEN_LIBS])
++
++
+ dnl Driver-Modules library
+ AC_ARG_WITH([driver-modules],
+   AC_HELP_STRING([--with-driver-modules], [build drivers as loadable modules @<:@default=no@:>@]),
+@@ -2137,30 +2159,16 @@ AC_ARG_WITH([driver-modules],
+   [with_driver_modules=no])
+ 
+ DRIVER_MODULE_CFLAGS=
+-DRIVER_MODULE_LIBS=
+ if test "x$with_driver_modules" = "xyes" ; then
+-  old_cflags="$CFLAGS"
+-  old_libs="$LIBS"
+-  fail=0
+-  AC_CHECK_HEADER([dlfcn.h],[],[fail=1])
+-  AC_SEARCH_LIBS([dlopen], [dl], [], [fail=1])
+-  test $fail = 1 &&
++  test $have_dlopen != "yes" &&
+       AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules])
+-
+-  CFLAGS="$old_cflags"
+-  LIBS="$old_libs"
+ fi
+ if test "$with_driver_modules" = "yes"; then
+   DRIVER_MODULE_CFLAGS="-export-dynamic"
+-  case $ac_cv_search_dlopen in
+-    no*) DRIVER_MODULE_LIBS= ;;
+-    *) DRIVER_MODULE_LIBS=$ac_cv_search_dlopen ;;
+-  esac
+   AC_DEFINE_UNQUOTED([WITH_DRIVER_MODULES], 1, [whether to build drivers as modules])
+ fi
+ AM_CONDITIONAL([WITH_DRIVER_MODULES], [test "$with_driver_modules" != "no"])
+ AC_SUBST([DRIVER_MODULE_CFLAGS])
+-AC_SUBST([DRIVER_MODULE_LIBS])
+ 
+ 
+ # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether
+@@ -2455,10 +2463,10 @@ AC_MSG_NOTICE([])
+ AC_MSG_NOTICE([ SELinux: $with_secdriver_selinux])
+ AC_MSG_NOTICE([AppArmor: $with_secdriver_apparmor])
+ AC_MSG_NOTICE([])
+-AC_MSG_NOTICE([Driver Loadable Modules])
++AC_MSG_NOTICE([Driver Loadable Modules / Dlopen])
+ AC_MSG_NOTICE([])
+-if test "$with_driver_modules" != "no" ; then
+-AC_MSG_NOTICE([  dlopen: $DRIVER_MODULE_CFLAGS $DRIVER_MODULE_LIBS])
++if test "$have_dlopen" != "no" ; then
++AC_MSG_NOTICE([  dlopen: $DRIVER_MODULE_CFLAGS $DLOPEN_CFLAGS $DLOPEN_LIBS])
+ else
+ AC_MSG_NOTICE([  dlopen: no])
+ fi
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 273b407..6f4f548 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,6 +10,7 @@ INCLUDES =							\
+ 		-I at top_srcdir@/src/util				\
+ 		-I at top_srcdir@/include				\
+ 		$(DRIVER_MODULE_CFLAGS)				\
++		$(DLOPEN_CFLAGS)				\
+ 		$(LIBXML_CFLAGS)				\
+ 		$(WARN_CFLAGS)					\
+ 		$(LOCK_CHECKING_CFLAGS)			\
+@@ -1141,6 +1142,7 @@ libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \
+ libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la
+ libvirt_la_LIBADD += $(LIBXML_LIBS) \
+ 		    $(DRIVER_MODULE_LIBS) \
++		    $(DLOPEN_LIBS) \
+ 		    $(CYGWIN_EXTRA_LIBADD)
+ libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS)
+ # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3f896fd..9c32fb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 nodeinfo-remove-superfluous-braces.patch
 Skip-nodeinfo-test-on-non-intel-architectures.patch
+Split-out-dlopen-detection.patch

-- 
Libvirt Debian packaging